These defines are specific to a SoC, not any specific board. Move these to the SoC level for these boards to be consistent with boards already doing this correctly.
J7200 didn't have these at all, add them while we are here. Signed-off-by: Andrew Davis <[email protected]> --- meta-ti-bsp/conf/machine/include/j7200.inc | 9 +++++++++ meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++++ meta-ti-bsp/conf/machine/j721s2-evm.conf | 6 ------ meta-ti-bsp/conf/machine/j784s4-evm.conf | 6 ------ 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index d21e26cc..af43605d 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -1,6 +1,15 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j7200" +# Default tiboot3.bin on J7200 is for GP +IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" + +# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" + TFA_BOARD = "generic" OPTEEMACHINE = "k3-j721e" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 98cc611f..98495582 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +# Default tiboot3.bin on J721S2 is for GP +IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" + +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" + TFA_BOARD = "generic" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index de207687..053d378e 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +# Default tiboot3.bin on J784S4 is for GP +IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" + +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" + TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 56a949e5..ecb1836f 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -19,9 +19,3 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" - -# Default tiboot3.bin on J721S2 is for GP -IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" - -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 2421b0b9..40a63651 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -19,9 +19,3 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "j784s4_evm_a72_defconfig" - -# Default tiboot3.bin on J784S4 is for GP -IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" - -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17189): https://lists.yoctoproject.org/g/meta-ti/message/17189 Mute This Topic: https://lists.yoctoproject.org/mt/102182710/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
