Skip to contentSkip to conversation

conf: machine: Breakout IMAGE_BOOT_FILES into new variables

RFC New Ryan Eatmon 1 participant 3 messages Aug 14, 2024

lore
Share & tools
lore
#0 lore raw

RFC v2 1/3 conf: machine: Breakout IMAGE_BOOT_FILES into new variables

The IMAGE_BOOT_FILES variable has been overloaded to include additional files that should be included in the boot partition but are not boot loaders themselves (images, etc...).

There is also a need to generate a report in the deploy directory for the list of actual bootloader files that were constructed as part of the build.

Solution, break the IMAGE_BOOT_FILES into two new variables TI_BOOTLAODERS and TI_MULTICONFIGS and default IMAGE_BOOT_FILES to TI_BOOTLOADERS. This way we can stick additional boot loaders into a new variable and they will will end up in the IMAGE_BOOT_FILES list.

---
 meta-ti-bsp/conf/machine/include/am62axx.inc  |  9 +++++---
 meta-ti-bsp/conf/machine/include/am62pxx.inc  |  3 ++-
 meta-ti-bsp/conf/machine/include/am62xx.inc   |  9 +++++---
 meta-ti-bsp/conf/machine/include/am64xx.inc   |  9 +++++---
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 10 ++++----
 meta-ti-bsp/conf/machine/include/am68.inc     |  6 +++--
 meta-ti-bsp/conf/machine/include/am69.inc     |  6 +++--
 meta-ti-bsp/conf/machine/include/j7200.inc    | 16 +++++++++----
 meta-ti-bsp/conf/machine/include/j721e.inc    | 23 +++++++++++++------
 meta-ti-bsp/conf/machine/include/j721s2.inc   |  9 +++++---
 meta-ti-bsp/conf/machine/include/j722s.inc    |  9 ++++++--
 meta-ti-bsp/conf/machine/include/j742s2.inc   |  6 +++--
 meta-ti-bsp/conf/machine/include/j784s4.inc   |  9 +++++---
 meta-ti-bsp/conf/machine/include/k3.inc       |  5 +++-
 meta-ti-bsp/conf/machine/include/omap-a15.inc |  3 ++-
 meta-ti-bsp/conf/machine/include/ti33x.inc    |  3 ++-
 meta-ti-bsp/conf/machine/include/ti43x.inc    |  3 ++-
 17 files changed, 95 insertions(+), 43 deletions(-)
meta-ti-bsp/conf/machine/include/am62axx.inc +6 -3
index 93a41d8d..8268a956 100644
@@ -6,13 +6,16 @@ MACHINE_FEATURES += "screen touchscreen"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 # Default tiboot3.bin on AM62A is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62ax-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am62ax-hs-fs-evm"
 
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62ax-gp-evm.bin"
+TI_MULTICONFIGS += "am62ax-gp-evm"
 
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62ax-hs-evm.bin"
+TI_MULTICONFIGS += "am62ax-hs-evm"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
meta-ti-bsp/conf/machine/include/am62pxx.inc +2 -1
index a2825905..cc9a2c01 100644
@@ -7,7 +7,8 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM62Px is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62px-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am62px-hs-fs-evm"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/am62xx.inc +6 -3
index 070a691b..21b6d1ec 100644
@@ -7,13 +7,16 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM62x is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62x-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am62x-hs-fs-evm"
 
 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62x-gp-evm.bin"
+TI_MULTICONFIGS += "am62x-gp-evm"
 
 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am62x-hs-evm.bin"
+TI_MULTICONFIGS += "am62x-hs-evm"
 
 # Bitmap image tarball for early splashscreen
 IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
meta-ti-bsp/conf/machine/include/am64xx.inc +6 -3
index 56b6df78..95529a83 100644
@@ -16,13 +16,16 @@ KERNEL_DEVICETREE = " \
 "
 
 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am64x_sr2-hs-fs-evm"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am64x-gp-evm.bin"
+TI_MULTICONFIGS += "am64x-gp-evm"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-evm.bin"
+TI_MULTICONFIGS += "am64x_sr2-hs-evm"
 
 TFA_BOARD = "lite"
 
meta-ti-bsp/conf/machine/include/am65xx.inc +6 -4
index 46513141..485dcc54 100644
@@ -24,12 +24,14 @@ KERNEL_DEVICETREE = " \
 IMAGE_BOOT_FILES += "sysfw.itb"
 
 # Default on AM65x is for GP
-IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
+TI_BOOTLOADERS += "tiboot3-am65x_sr2-gp-evm.bin"
+TI_BOOTLOADERS += "sysfw-am65x_sr2-gp-evm.itb"
+TI_MULTICONFIGS += "am65x_sr2-gp-evm"
 
 # Since default on AM65x is for GP, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
+TI_BOOTLOADERS += "tiboot3-am65x_sr2-hs-evm.bin"
+TI_BOOTLOADERS += "sysfw-am65x_sr2-hs-evm.itb"
+TI_MULTICONFIGS += "am65x_sr2-hs-evm"
 
 TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/am68.inc +4 -2
index 327366be..a7ccea79 100644
@@ -7,10 +7,12 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM68 is for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-fs-evm"
 
 # Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-evm"
 
 TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/am69.inc +4 -2
index 488f9c33..d18cf740 100644
@@ -7,10 +7,12 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM69 is for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-fs-evm"
 
 # Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-evm"
 
 TFA_BOARD = "j784s4"
 
meta-ti-bsp/conf/machine/include/j7200.inc +12 -4
index 2a11e3dd..bee2345f 100644
@@ -7,18 +7,26 @@ IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
 # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS
 IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
 IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+MULTICONFIG_SR1_HS_FS = "j7200-hs-fs-evm"
+MULTICONFIG_SR1_HS_FS:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_HS_FS_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_FS}"
 
 # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
 IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
 IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+MULTICONFIG_SR1_HS_SE = "j7200-hs-evm"
+MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
 
 # 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"
+TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j7200_sr2-hs-fs-evm"
 
 # 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"
+TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-evm.bin"
+TI_MULTICONFIGS += "j7200_sr2-hs-evm"
 
 TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/j721e.inc +16 -7
index 62487aa9..29e50023 100644
@@ -6,29 +6,38 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
-IMAGE_BOOT_FILES += "sysfw.itb"
+TI_BOOTLOADERS += "sysfw.itb"
 
 # Default on J721e is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
+TI_BOOTLOADERS += "tiboot3-j721e-gp-evm.bin"
+TI_BOOTLOADERS += "sysfw-j721e-gp-evm.itb"
+TI_MULTICONFIGS += "j721e-gp-evm"
 
 # Since default on J721e is for GP, add a version for SR1.1 HS-FS
 IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
 IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
+MULTICONFIG_SR1_1_HS_FS = "j721e_sr1_1-hs-fs-evm"
+MULTICONFIG_SR1_1_HS_FS:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_FS_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_1_HS_FS}"
 
 # Since default on J721e is for GP, add a version for SR1.1 HS-SE
 IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_SE_FILES}"
+TI_MULTICONFIGS += "j721e_sr1_1-hs-evm"
 
 # Since default on J721e is for GP, add a version for SR2.0 HS-FS
 IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+TI_BOOTLOADERS += "${IMAGE_SR2_HS_FS_FILES}"
+TI_MULTICONFIGS += "j721e_sr2-hs-fs-evm"
 
 # Since default on J721e is for GP, add a version for SR2.0 HS-SE
 IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
 IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
+MULTICONFIG_SR2_HS_SE = "j721e_sr2-hs-evm"
+MULTICONFIG_SR2_HS_SE:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR2_HS_SE_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR2_HS_SE}"
 
 TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/j721s2.inc +6 -3
index 9cd88d9b..5ebb4a16 100644
@@ -7,13 +7,16 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J721S2 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j721s2-gp-evm.bin"
+TI_MULTICONFIGS += "j721s2-gp-evm"
 
 # 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"
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-fs-evm"
 
 # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-evm"
 
 TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/j722s.inc +7 -2
index ef35d83a..42f50feb 100644
@@ -7,13 +7,18 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J722S is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j722s-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j722s-hs-fs-evm"
 
 # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
 IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
 IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
 IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+MULTICONFIG_SR1_HS_SE = "j722s-hs-evm"
+MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
+MULTICONFIG_SR1_HS_SE:bsp-next = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/j742s2.inc +4 -2
index aad7a768..7c248310 100644
@@ -7,10 +7,12 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J742S2 is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j742s2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j742s2-hs-fs-evm"
 
 # Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j742s2-hs-evm.bin"
+TI_MULTICONFIGS += "j742s2-hs-evm"
 
 TFA_BOARD = "j784s4"
 
meta-ti-bsp/conf/machine/include/j784s4.inc +6 -3
index 883c4a6e..6fb26bbc 100644
@@ -7,13 +7,16 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J784S4 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j784s4-gp-evm.bin"
+TI_MULTICONFIGS += "j784s4-gp-evm"
 
 # 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"
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-fs-evm"
 
 # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-evm"
 
 TFA_BOARD = "j784s4"
 
meta-ti-bsp/conf/machine/include/k3.inc +4 -1
index 34991ec9..2e5ffe09 100644
@@ -48,7 +48,10 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+TI_BOOTLOADERS ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+TI_MULTICONFIGS = ""
+
+IMAGE_BOOT_FILES ?= "${TI_BOOTLOADERS}"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
 EFI_PROVIDER ?= "grub-efi"
meta-ti-bsp/conf/machine/include/omap-a15.inc +2 -1
index be086936..6092040a 100644
@@ -48,5 +48,6 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc3
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_MULTICONFIGS = ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti33x.inc +2 -1
index 7e9eb48c..2287f24c 100644
@@ -94,5 +94,6 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_MULTICONFIGS = ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +2 -1
index 2621d19a..74c1defa 100644
@@ -66,5 +66,6 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_MULTICONFIGS = ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
Signature · 1 line
2.17.1
#1 lore raw

RFC v2 2/3 ti-unified-wic: Tool to create new wics from deployed collateral

Deploy a shell script that can take the deployed images/bootloaders from a build and swap out the bootloader files with alternate versions produced from the UBOOT_CONFIG flow and from what the u-boot binman tool creates.

---
 .../recipes-ti/ti-unified-wic/files/LICENSE   |   7 +
 .../ti-unified-wic/files/ti_unified_wic.sh    | 370 ++++++++++++++++++
 .../ti-unified-wic/ti-unified-wic.bb          |  37 ++
 3 files changed, 414 insertions(+)
 create mode 100644 meta-ti-bsp/recipes-ti/ti-unified-wic/files/LICENSE
 create mode 100755 meta-ti-bsp/recipes-ti/ti-unified-wic/files/ti_unified_wic.sh
 create mode 100644 meta-ti-bsp/recipes-ti/ti-unified-wic/ti-unified-wic.bb
meta-ti-bsp/recipes-ti/ti-unified-wic/files/LICENSE new file +7 -0
new file mode 100644
index 00000000..abbd6489
@@ -0,0 +1,7 @@
+Copyright 2024 Texas Instruments, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ?Software?), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ?AS IS?, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
meta-ti-bsp/recipes-ti/ti-unified-wic/files/ti_unified_wic.sh new file +370 -0

370 lines not on this page · raw message

meta-ti-bsp/recipes-ti/ti-unified-wic/ti-unified-wic.bb new file +37 -0
new file mode 100644
index 00000000..5f5d9982
@@ -0,0 +1,37 @@
+SUMMARY = "TI Unified WIC builder"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=92b3423643fe55420ad98ab5bef7c799"
+
+inherit deploy
+
+SRC_URI = " \
+    file://ti_unified_wic.sh;name=ti_unified_wic \
+    file://LICENSE;name=license \
+"
+
+SRC_URI[ti_unified_wic.sha256sum] = "aecf38ebca7f25263d4656d12b210db1197aca92d311d44f924906bb86982b7a"
+SRC_URI[license.sha256sum] = "2a0aebb221c0b2b97b907baf8eb103fb3474cfcadb78667859e028a5e52e984c"
+
+S = "${WORKDIR}"
+
+do_deploy() {
+
+    install -m 0755 ${S}/ti_unified_wic.sh ${DEPLOYDIR}
+
+    loCfg="${DEPLOYDIR}/ti_unified_wic.cfg"
+
+    echo "[machine]" > $loCfg
+    echo "${MACHINE}" >> $loCfg
+    echo "" >> $loCfg
+    echo "[variants]" >> $loCfg
+    echo "${UBOOT_CONFIG}" >> $loCfg
+    echo "" >> $loCfg
+    echo "[multiconfigs]" >> $loCfg
+    echo "${TI_MULTICONFIGS}" >> $loCfg
+    echo "" >> $loCfg
+    echo "[bootloaders]" >> $loCfg
+    echo "${TI_BOOTLOADERS}" >> $loCfg
+}
+
+addtask deploy after do_install before do_build
+
Signature · 1 line
2.17.1
#2 lore raw

RFC v2 3/3 conf: machine: am62xx-unified: Create new common am62xx machine

In reply to Ryan Eatmon

To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support building the specific target if desired.

---
v2: No changes, just including in series.

 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |  9 +---
 meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 +--
 .../conf/machine/am62xx-lp-evm-k3r5.conf      |  9 +---
 meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 +--
 .../conf/machine/am62xx-unified-k3r5.conf     | 20 +++++++++
 meta-ti-bsp/conf/machine/am62xx-unified.conf  | 43 +++++++++++++++++++
 .../conf/machine/am62xxsip-evm-k3r5.conf      |  8 ++--
 meta-ti-bsp/conf/machine/am62xxsip-evm.conf   |  6 +--
 8 files changed, 76 insertions(+), 29 deletions(-)
 create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
 create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +2 -7
index 548369ca..3a819835 100644
@@ -2,11 +2,6 @@
 #@NAME: AM62XX EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-evm.conf +2 -3
index 31de4a14..8c80cb1f 100644
@@ -2,8 +2,7 @@
 #@NAME: AM62XX EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
 
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +2 -7
index 52b69a72..fb760e99 100644
@@ -2,11 +2,6 @@
 #@NAME: AM62XX LP GP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +2 -3
index e9271f5b..f7d89d68 100644
@@ -2,8 +2,7 @@
 #@NAME: AM62XX LP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
 
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62-lp \
@@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file +20 -0
new file mode 100644
index 00000000..7d65e6af
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_r5_defconfig"
meta-ti-bsp/conf/machine/am62xx-unified.conf new file +43 -0

43 lines not on this page · raw message

meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +3 -5
index 55bc530b..ab538ff3 100644
@@ -2,13 +2,11 @@
 #@NAME: AM62XX SIP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_CONFIG = "sip"
 
-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG:bsp-ti-6_1 = ""
 
 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
 
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +2 -4
index 8104329e..6b179b80 100644
@@ -2,7 +2,7 @@
 #@NAME: AM62XX SIP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
 
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
 "
 
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"
Signature · 1 line
2.17.1