mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-06 02:42:34 +00:00
Code Issues Projects Releases Wiki Activity

conf: machine: Switch all the machines over to U-Boot binman

Browse Source 
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2023-05-25 13:11:31 -05:00
committed by Ryan Eatmon
parent e74b9a1746
commit 568e63b542
26 changed files with 59 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+12
View File
@@ -0,0 +1,12 @@
#@TYPE: Machine
#@NAME: AM62A HS-FS EVM (R5F)
#@DESCRIPTION: Machine configuration for the TI AM62A EVM (R5F core)
require conf/machine/include/k3r5.inc
SOC_FAMILY:append = ":k3r5-hs-fs"
SYSFW_SOC = "am62ax"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs-fs"
UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
meta-ti-bsp/conf/machine/am62axx-evm.conf
-4
View File
@@ -14,7 +14,3 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+11
View File
@@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: AM62XX EVM (R5F)
#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
require conf/machine/include/k3r5.inc
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
meta-ti-bsp/conf/machine/am62xx-evm.conf
+2 -2
View File
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
SPL_BINARY = "tispl.bin"
UBOOT_BINARY = "u-boot.img"
UBOOT_SYMLINK = "u-boot.img"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
-7
View File
@@ -9,11 +9,4 @@ SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
SYSFW_TIBOOT3_SYMLINK = ""
UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
SPL_BINARY = ""
UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
-4
View File
@@ -13,8 +13,4 @@ KERNEL_DEVICETREE = " \
ti/k3-am62-lp-sk.dtb \
"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
+12
View File
@@ -0,0 +1,12 @@
#@TYPE: Machine
#@NAME: AM64xx EVM (R5F)
#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
require conf/machine/include/k3r5.inc
SOC_FAMILY:append = ":am64xx"
SYSFW_SOC = "am64x_sr2"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs-fs"
UBOOT_MACHINE = "am64x_evm_r5_defconfig"
meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
+1 -6
View File
@@ -7,12 +7,7 @@ require conf/machine/include/k3r5.inc
SYSFW_SOC = "am65x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
SYSFW_SYMLINK = ""
SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned"
UBOOT_MACHINE = "am65x_evm_r5_defconfig"
meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
+1 -6
View File
@@ -7,12 +7,7 @@ require conf/machine/include/k3r5.inc
SYSFW_SOC = "am65x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs"
SYSFW_SYMLINK = ""
SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
SPL_BINARY = "tiboot3.${SPL_SUFFIX}"
UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
-4
View File
@@ -7,7 +7,3 @@ SYSFW_SUFFIX = "hs"
require conf/machine/include/am65xx.inc
UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
meta-ti-bsp/conf/machine/include/am62axx.inc
-6
View File
@@ -6,19 +6,13 @@ MACHINE_FEATURES += "screen touchscreen"
TFA_K3_SYSTEM_SUSPEND = "1"
# Default tiboot3.bin on AM62A is for HS-FS
BBMULTICONFIG = "k3r5-hs-fs"
IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
BBMULTICONFIG += "k3r5-gp"
IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
BBMULTICONFIG += "k3r5-hs-se"
IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
TFA_BOARD = "lite"
OPTEEMACHINE = "k3-am62x"
meta-ti-bsp/conf/machine/include/am62xx-lp.inc
-4
View File
@@ -6,14 +6,10 @@ MACHINE_FEATURES += "screen touchscreen"
TFA_K3_SYSTEM_SUSPEND = "1"
# Default tiboot3.bin on AM62x LP is for HS-FS
BBMULTICONFIG = "k3r5-hs-fs"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
BBMULTICONFIG += "k3r5-hs-se"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
TFA_BOARD = "lite"
OPTEEMACHINE = "k3-am62x"
meta-ti-bsp/conf/machine/include/am62xx.inc
-6
View File
@@ -7,19 +7,13 @@ require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
# Default tiboot3.bin on AM62x is for HS-FS
BBMULTICONFIG = "k3r5-hs-fs"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
BBMULTICONFIG += "k3r5-gp"
IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
BBMULTICONFIG += "k3r5-hs-se"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
TFA_BOARD = "lite"
TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/am64xx.inc
-6
View File
@@ -9,18 +9,12 @@ KERNEL_DEVICETREE = " \
"
# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
BBMULTICONFIG = "k3r5-sr2-hs-fs"
do_image_complete[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
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
BBMULTICONFIG += "k3r5-gp"
do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
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
BBMULTICONFIG += "k3r5-sr2-hs-se"
do_image_complete[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
TFA_BOARD = "lite"
meta-ti-bsp/conf/machine/include/am65xx.inc
+5 -8
View File
@@ -12,16 +12,13 @@ KERNEL_DEVICETREE = " \
ti/k3-am654-base-board.dtb \
"
# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
IMAGE_BOOT_FILES += "sysfw.itb"
# Default sysfw.itb on AM65x is for SR2.0
BBMULTICONFIG += "k3r5-sr2"
do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
IMAGE_BOOT_FILES += "sysfw.itb sysfw-am65x_sr2-${SYSFW_SUFFIX}-evm.itb"
# Default sysfw.itb on AM65x is for GP
IMAGE_BOOT_FILES += "sysfw-am65x-gp-evm.itb"
# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
IMAGE_BOOT_FILES += "sysfw-am65x-${SYSFW_SUFFIX}-evm.itb"
# Since default sysfw.itb on AM65x is for GP, add a version for HS-SE
IMAGE_BOOT_FILES += "sysfw-am65x-hs-evm.itb"
TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/j721e.inc
+9 -3
View File
@@ -6,11 +6,17 @@ MACHINE_FEATURES += "screen gpu"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
IMAGE_BOOT_FILES += "sysfw.itb"
# Default sysfw.itb on J721e is for GP
IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
# Since default sysfw.itb on J721e is for GP, add a version for HS-FS
IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
# Since default sysfw.itb on J721e is for GP, add a version for HS-SE
IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
TFA_BOARD = "generic"
OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/k3.inc
+1 -1
View File
@@ -53,7 +53,7 @@ MACHINE_FEATURES += "efi"
WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
meta-ti-bsp/conf/machine/include/k3r5.inc
+3 -1
View File
@@ -15,7 +15,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
SPL_BINARY = ""
SPL_SUFFIX = "bin"
SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}"
UBOOT_SUFFIX = "bin"
UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
meta-ti-bsp/conf/machine/j7200-hs-evm.conf
-4
View File
@@ -5,7 +5,3 @@
require conf/machine/j7200-evm.conf
UBOOT_MACHINE = "j7200_evm_a72_defconfig"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
+1 -5
View File
@@ -8,10 +8,6 @@ SYSFW_SOC = "j721e"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned"
UBOOT_MACHINE = "j721e_evm_r5_defconfig"
meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
+1 -5
View File
@@ -8,10 +8,6 @@ SYSFW_SOC = "j721e_sr1_1"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs"
SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
SPL_BINARY = "tiboot3.${SPL_SUFFIX}"
UBOOT_MACHINE = "j721e_evm_r5_defconfig"
meta-ti-bsp/conf/machine/j721e-hs-evm.conf
-5
View File
@@ -5,8 +5,3 @@
require conf/machine/j721e-evm.conf
UBOOT_MACHINE = "j721e_evm_a72_defconfig"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
SYSFW_SYMLINK = ""
meta-ti-bsp/conf/machine/j721s2-evm.conf
-4
View File
@@ -20,11 +20,7 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
# Default tiboot3.bin on J721S2 is for GP
BBMULTICONFIG = "k3r5-gp"
IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
BBMULTICONFIG += "k3r5-sr1-hs-fs"
IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
-6
View File
@@ -18,9 +18,3 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
meta-ti-bsp/conf/machine/j784s4-evm.conf
-4
View File
@@ -20,11 +20,7 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
# Default tiboot3.bin on J784S4 is for GP
BBMULTICONFIG = "k3r5-gp"
IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
BBMULTICONFIG += "k3r5-sr1-hs-fs"
IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
-2
View File
@@ -20,8 +20,6 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
TFA_BOARD = "j784s4"
SPL_BINARY = "tispl.bin_HS"