mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-06-06 10:50:37 +00:00
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>
This commit is contained in:
committed by
Ryan Eatmon
parent
0942b58dab
commit
4033c054c0
@@ -32,4 +32,5 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
|
||||
do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
|
||||
|
||||
TFA_BOARD = "lite"
|
||||
|
||||
OPTEEMACHINE = "k3-am64x"
|
||||
|
||||
@@ -37,4 +37,6 @@ IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
|
||||
do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
|
||||
do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
|
||||
|
||||
TFA_BOARD = "generic"
|
||||
|
||||
OPTEEMACHINE = "k3-am65x"
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
require conf/machine/include/k3.inc
|
||||
SOC_FAMILY:append = ":j7200"
|
||||
|
||||
TFA_BOARD = "generic"
|
||||
|
||||
OPTEEMACHINE = "k3-j721e"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
require conf/machine/include/k3.inc
|
||||
SOC_FAMILY:append = ":j721e"
|
||||
|
||||
OPTEEMACHINE = "k3-j721e"
|
||||
|
||||
MACHINE_FEATURES += "gpu"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
|
||||
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
|
||||
|
||||
TFA_BOARD = "generic"
|
||||
|
||||
OPTEEMACHINE = "k3-j721e"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
require conf/machine/include/k3.inc
|
||||
SOC_FAMILY:append = ":j721s2"
|
||||
|
||||
OPTEEMACHINE = "k3-j721e"
|
||||
|
||||
MACHINE_FEATURES += "gpu"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
|
||||
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
|
||||
|
||||
TFA_BOARD = "generic"
|
||||
|
||||
OPTEEMACHINE = "k3-j784s4"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
require conf/machine/include/k3.inc
|
||||
SOC_FAMILY:append = ":j784s4"
|
||||
|
||||
OPTEEMACHINE = "k3-j721e"
|
||||
|
||||
MACHINE_FEATURES += "gpu"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
|
||||
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
|
||||
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
|
||||
|
||||
TFA_BOARD = "j784s4"
|
||||
|
||||
OPTEEMACHINE = "k3-j784s4"
|
||||
|
||||
@@ -29,7 +29,6 @@ UBOOT_SUFFIX = "img"
|
||||
EXTRA_IMAGEDEPENDS += "virtual/bootloader"
|
||||
|
||||
TFA_PLATFORM = "k3"
|
||||
TFA_BOARD = "generic"
|
||||
|
||||
# Use the expected value of the ubifs filesystem's volume name in the kernel
|
||||
# and u-boot.
|
||||
|
||||
@@ -7,7 +7,6 @@ require conf/machine/include/j721s2.inc
|
||||
SERIAL_CONSOLES = "115200;ttyS2"
|
||||
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
|
||||
TFA_K3_USART = "0x8"
|
||||
OPTEEMACHINE = "k3-j784s4"
|
||||
OPTEE_K3_USART = "0x8"
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
|
||||
@@ -7,7 +7,6 @@ require conf/machine/include/j784s4.inc
|
||||
SERIAL_CONSOLES = "115200;ttyS2"
|
||||
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
|
||||
TFA_K3_USART = "0x8"
|
||||
OPTEEMACHINE = "k3-j784s4"
|
||||
OPTEE_K3_USART = "0x8"
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
@@ -18,6 +17,3 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
|
||||
|
||||
do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
|
||||
do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
|
||||
|
||||
TFA_BOARD = "j784s4"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user