diff options
author | Andrew Davis <afd@ti.com> | 2023-01-20 01:40:49 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-01-20 15:55:32 -0600 |
commit | 1a91eaabccd846c01c9a4cebf870eb26abc6acc5 (patch) | |
tree | 1480cd771577f8f9857bebcebd0cc82107b8ce20 /meta-ti-bsp/conf/machine | |
parent | 762660fbcb9dc39f3fc4ac0895ca2f92285c487c (diff) | |
download | meta-ti-1a91eaabccd846c01c9a4cebf870eb26abc6acc5.tar.gz |
conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level
These defines are specific to a SoC, not a SoC family (K3) nor
any specific board. Move these to the SoC level for all boards
to be consistent with boards already doing this correctly.
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/conf/machine')
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am64xx.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am65xx.inc | 2 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j7200.inc | 2 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721e.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721s2.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j784s4.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/k3.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/j784s4-evm.conf | 4 |
9 files changed, 17 insertions, 12 deletions
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 7c46b630..f1a91991 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc | |||
@@ -32,4 +32,5 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | |||
32 | do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | 32 | do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" |
33 | 33 | ||
34 | TFA_BOARD = "lite" | 34 | TFA_BOARD = "lite" |
35 | |||
35 | OPTEEMACHINE = "k3-am64x" | 36 | OPTEEMACHINE = "k3-am64x" |
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 14e0d07f..88259717 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc | |||
@@ -37,4 +37,6 @@ IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" | |||
37 | do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | 37 | do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" |
38 | do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | 38 | do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" |
39 | 39 | ||
40 | TFA_BOARD = "generic" | ||
41 | |||
40 | OPTEEMACHINE = "k3-am65x" | 42 | OPTEEMACHINE = "k3-am65x" |
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index 1eaf7806..d21e26cc 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc | |||
@@ -1,4 +1,6 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j7200" | 2 | SOC_FAMILY:append = ":j7200" |
3 | 3 | ||
4 | TFA_BOARD = "generic" | ||
5 | |||
4 | OPTEEMACHINE = "k3-j721e" | 6 | OPTEEMACHINE = "k3-j721e" |
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 34569a01..12ee0c90 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc | |||
@@ -1,8 +1,6 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j721e" | 2 | SOC_FAMILY:append = ":j721e" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | ||
5 | |||
6 | MACHINE_FEATURES += "gpu" | 4 | MACHINE_FEATURES += "gpu" |
7 | 5 | ||
8 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | 6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" |
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | |||
10 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" |
11 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" |
12 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
11 | |||
12 | TFA_BOARD = "generic" | ||
13 | |||
14 | OPTEEMACHINE = "k3-j721e" | ||
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 2a60458e..fc6493b8 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc | |||
@@ -1,8 +1,6 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j721s2" | 2 | SOC_FAMILY:append = ":j721s2" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | ||
5 | |||
6 | MACHINE_FEATURES += "gpu" | 4 | MACHINE_FEATURES += "gpu" |
7 | 5 | ||
8 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | 6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" |
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | |||
10 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" |
11 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" |
12 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
11 | |||
12 | TFA_BOARD = "generic" | ||
13 | |||
14 | OPTEEMACHINE = "k3-j784s4" | ||
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index e2f053ac..d268b810 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc | |||
@@ -1,8 +1,6 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j784s4" | 2 | SOC_FAMILY:append = ":j784s4" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | ||
5 | |||
6 | MACHINE_FEATURES += "gpu" | 4 | MACHINE_FEATURES += "gpu" |
7 | 5 | ||
8 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | 6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" |
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | |||
10 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" |
11 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" |
12 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
11 | |||
12 | TFA_BOARD = "j784s4" | ||
13 | |||
14 | OPTEEMACHINE = "k3-j784s4" | ||
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 84afd2e2..bd71becf 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
@@ -29,7 +29,6 @@ UBOOT_SUFFIX = "img" | |||
29 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" | 29 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
30 | 30 | ||
31 | TFA_PLATFORM = "k3" | 31 | TFA_PLATFORM = "k3" |
32 | TFA_BOARD = "generic" | ||
33 | 32 | ||
34 | # Use the expected value of the ubifs filesystem's volume name in the kernel | 33 | # Use the expected value of the ubifs filesystem's volume name in the kernel |
35 | # and u-boot. | 34 | # and u-boot. |
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 37353df4..46d5dbf6 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf | |||
@@ -7,7 +7,6 @@ require conf/machine/include/j721s2.inc | |||
7 | SERIAL_CONSOLES = "115200;ttyS2" | 7 | SERIAL_CONSOLES = "115200;ttyS2" |
8 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 8 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
9 | TFA_K3_USART = "0x8" | 9 | TFA_K3_USART = "0x8" |
10 | OPTEEMACHINE = "k3-j784s4" | ||
11 | OPTEE_K3_USART = "0x8" | 10 | OPTEE_K3_USART = "0x8" |
12 | 11 | ||
13 | KERNEL_DEVICETREE = " \ | 12 | KERNEL_DEVICETREE = " \ |
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 10d8aad0..f8be7d18 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf | |||
@@ -7,7 +7,6 @@ require conf/machine/include/j784s4.inc | |||
7 | SERIAL_CONSOLES = "115200;ttyS2" | 7 | SERIAL_CONSOLES = "115200;ttyS2" |
8 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 8 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
9 | TFA_K3_USART = "0x8" | 9 | TFA_K3_USART = "0x8" |
10 | OPTEEMACHINE = "k3-j784s4" | ||
11 | OPTEE_K3_USART = "0x8" | 10 | OPTEE_K3_USART = "0x8" |
12 | 11 | ||
13 | KERNEL_DEVICETREE = " \ | 12 | KERNEL_DEVICETREE = " \ |
@@ -18,6 +17,3 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" | |||
18 | 17 | ||
19 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 18 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
20 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 19 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
21 | |||
22 | TFA_BOARD = "j784s4" | ||
23 | |||