mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-07 19:32:58 +00:00
Code Issues Projects Releases Wiki Activity

Revert "conf: machine: Breakout IMAGE_BOOT_FILES into new variables"

Browse Source 
This reverts commit cada5eb9a6.
This commit is contained in:
Ryan Eatmon
2024-09-12 12:24:10 -05:00
parent 11ce93afcf
commit 07edb3156e
17 changed files with 43 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/include/am62axx.inc
+3 -6
View File
@@ -6,16 +6,13 @@ MACHINE_FEATURES += "screen touchscreen"
TFA_K3_SYSTEM_SUSPEND = "1"
# Default tiboot3.bin on AM62A is for HS-FS
TI_BOOTLOADERS += "tiboot3-am62ax-hs-fs-evm.bin"
TI_MULTICONFIGS += "am62ax-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
TI_BOOTLOADERS += "tiboot3-am62ax-gp-evm.bin"
TI_MULTICONFIGS += "am62ax-gp-evm"
IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
TI_BOOTLOADERS += "tiboot3-am62ax-hs-evm.bin"
TI_MULTICONFIGS += "am62ax-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
TFA_BOARD = "lite"
OPTEEMACHINE = "k3-am62x"
meta-ti-bsp/conf/machine/include/am62pxx.inc
+1 -2
View File
@@ -7,8 +7,7 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
# Default tiboot3.bin on AM62Px is for HS-FS
TI_BOOTLOADERS += "tiboot3-am62px-hs-fs-evm.bin"
TI_MULTICONFIGS += "am62px-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
TFA_BOARD = "lite"
TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/am62xx.inc
+3 -6
View File
@@ -7,16 +7,13 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
# Default tiboot3.bin on AM62x is for HS-FS
TI_BOOTLOADERS += "tiboot3-am62x-hs-fs-evm.bin"
TI_MULTICONFIGS += "am62x-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
TI_BOOTLOADERS += "tiboot3-am62x-gp-evm.bin"
TI_MULTICONFIGS += "am62x-gp-evm"
IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
TI_BOOTLOADERS += "tiboot3-am62x-hs-evm.bin"
TI_MULTICONFIGS += "am62x-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
# Bitmap image tarball for early splashscreen
IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
meta-ti-bsp/conf/machine/include/am64xx.inc
+3 -6
View File
@@ -16,16 +16,13 @@ KERNEL_DEVICETREE = " \
"
# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-fs-evm.bin"
TI_MULTICONFIGS += "am64x_sr2-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
TI_BOOTLOADERS += "tiboot3-am64x-gp-evm.bin"
TI_MULTICONFIGS += "am64x-gp-evm"
IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-evm.bin"
TI_MULTICONFIGS += "am64x_sr2-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
TFA_BOARD = "lite"
meta-ti-bsp/conf/machine/include/am65xx.inc
+4 -6
View File
@@ -24,14 +24,12 @@ KERNEL_DEVICETREE = " \
IMAGE_BOOT_FILES += "sysfw.itb"
# Default on AM65x is for GP
TI_BOOTLOADERS += "tiboot3-am65x_sr2-gp-evm.bin"
TI_BOOTLOADERS += "sysfw-am65x_sr2-gp-evm.itb"
TI_MULTICONFIGS += "am65x_sr2-gp-evm"
IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
# Since default on AM65x is for GP, add a version for HS-SE
TI_BOOTLOADERS += "tiboot3-am65x_sr2-hs-evm.bin"
TI_BOOTLOADERS += "sysfw-am65x_sr2-hs-evm.itb"
TI_MULTICONFIGS += "am65x_sr2-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/am68.inc
+2 -4
View File
@@ -7,12 +7,10 @@ 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
TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
TI_MULTICONFIGS += "j721s2-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
TI_MULTICONFIGS += "j721s2-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/am69.inc
+2 -4
View File
@@ -7,12 +7,10 @@ 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
TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
TI_MULTICONFIGS += "j784s4-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
TI_MULTICONFIGS += "j784s4-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
TFA_BOARD = "j784s4"
meta-ti-bsp/conf/machine/include/j7200.inc
+4 -12
View File
@@ -7,26 +7,18 @@ 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 = ""
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}"
IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
# 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 = ""
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}"
IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-fs-evm.bin"
TI_MULTICONFIGS += "j7200_sr2-hs-fs-evm"
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
TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-evm.bin"
TI_MULTICONFIGS += "j7200_sr2-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/j721e.inc
+7 -16
View File
@@ -6,38 +6,29 @@ MACHINE_FEATURES += "screen gpu"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
TI_BOOTLOADERS += "sysfw.itb"
IMAGE_BOOT_FILES += "sysfw.itb"
# Default on J721e is for GP
TI_BOOTLOADERS += "tiboot3-j721e-gp-evm.bin"
TI_BOOTLOADERS += "sysfw-j721e-gp-evm.itb"
TI_MULTICONFIGS += "j721e-gp-evm"
IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
# 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 = ""
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}"
IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
# 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"
TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_SE_FILES}"
TI_MULTICONFIGS += "j721e_sr1_1-hs-evm"
IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
# 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"
TI_BOOTLOADERS += "${IMAGE_SR2_HS_FS_FILES}"
TI_MULTICONFIGS += "j721e_sr2-hs-fs-evm"
IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
# 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 = ""
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}"
IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/j721s2.inc
+3 -6
View File
@@ -7,16 +7,13 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
# Default tiboot3.bin on J721S2 is for GP
TI_BOOTLOADERS += "tiboot3-j721s2-gp-evm.bin"
TI_MULTICONFIGS += "j721s2-gp-evm"
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
TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
TI_MULTICONFIGS += "j721s2-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
TI_MULTICONFIGS += "j721s2-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/j722s.inc
+2 -7
View File
@@ -7,18 +7,13 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
# Default tiboot3.bin on J722S is for HS-FS
TI_BOOTLOADERS += "tiboot3-j722s-hs-fs-evm.bin"
TI_MULTICONFIGS += "j722s-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
# 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 = ""
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}"
IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
TFA_BOARD = "lite"
TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/j742s2.inc
+2 -4
View File
@@ -7,12 +7,10 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
# Default tiboot3.bin on J742S2 is for HS-FS
TI_BOOTLOADERS += "tiboot3-j742s2-hs-fs-evm.bin"
TI_MULTICONFIGS += "j742s2-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin"
# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE
TI_BOOTLOADERS += "tiboot3-j742s2-hs-evm.bin"
TI_MULTICONFIGS += "j742s2-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin"
TFA_BOARD = "j784s4"
meta-ti-bsp/conf/machine/include/j784s4.inc
+3 -6
View File
@@ -7,16 +7,13 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
# Default tiboot3.bin on J784S4 is for GP
TI_BOOTLOADERS += "tiboot3-j784s4-gp-evm.bin"
TI_MULTICONFIGS += "j784s4-gp-evm"
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
TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
TI_MULTICONFIGS += "j784s4-hs-fs-evm"
IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
TI_MULTICONFIGS += "j784s4-hs-evm"
IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
TFA_BOARD = "j784s4"
meta-ti-bsp/conf/machine/include/k3.inc
+1 -4
View File
@@ -48,10 +48,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
TI_BOOTLOADERS ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
TI_MULTICONFIGS = ""
IMAGE_BOOT_FILES ?= "${TI_BOOTLOADERS}"
IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
EFI_PROVIDER ?= "grub-efi"
meta-ti-bsp/conf/machine/include/omap-a15.inc
+1 -2
View File
@@ -48,6 +48,5 @@ 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"
TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
TI_MULTICONFIGS = ""
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti33x.inc
+1 -2
View File
@@ -94,6 +94,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"
TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
TI_MULTICONFIGS = ""
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc
+1 -2
View File
@@ -66,6 +66,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"
TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
TI_MULTICONFIGS = ""
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
do_image_wic[depends] += "virtual/bootloader:do_deploy"