diff options
author | Ryan Eatmon <reatmon@ti.com> | 2023-05-16 11:42:23 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-05-17 09:46:34 -0500 |
commit | 6eb5ffb743ef7e9c69915cd577fe3ce5c3e3deb9 (patch) | |
tree | fe1cb04df6a0d61da224bb436cafd3e3ea87a676 | |
parent | 49c17fb2775c814cca54ca53a77a5e3eb515bf3a (diff) | |
download | meta-ti-6eb5ffb743ef7e9c69915cd577fe3ce5c3e3deb9.tar.gz |
ti-sci-fw: Add SYSFW_SUFFIX to SYSFW_BINARY to match k3-image-gen
k3_image_gen added the suffix to the sysfw binary to differentiate
between GP and HS binaries.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/conf/machine/am65xx-evm.conf | 2 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 2 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am65xx.inc | 4 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 32 |
4 files changed, 22 insertions, 18 deletions
diff --git a/meta-ti-bsp/conf/machine/am65xx-evm.conf b/meta-ti-bsp/conf/machine/am65xx-evm.conf index 8b6ef546..63f2ecc5 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm.conf | |||
@@ -2,6 +2,8 @@ | |||
2 | #@NAME: AM65xx EVM | 2 | #@NAME: AM65xx EVM |
3 | #@DESCRIPTION: Machine configuration for the TI AM65xx EVM | 3 | #@DESCRIPTION: Machine configuration for the TI AM65xx EVM |
4 | 4 | ||
5 | SYSFW_SUFFIX = "gp" | ||
6 | |||
5 | require conf/machine/include/am65xx.inc | 7 | require conf/machine/include/am65xx.inc |
6 | 8 | ||
7 | UBOOT_MACHINE = "am65x_evm_a53_defconfig" | 9 | UBOOT_MACHINE = "am65x_evm_a53_defconfig" |
diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf index 2c1256d0..84d616a4 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | |||
@@ -2,6 +2,8 @@ | |||
2 | #@NAME: AM65xx HS EVM | 2 | #@NAME: AM65xx HS EVM |
3 | #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM | 3 | #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM |
4 | 4 | ||
5 | SYSFW_SUFFIX = "hs" | ||
6 | |||
5 | require conf/machine/include/am65xx.inc | 7 | require conf/machine/include/am65xx.inc |
6 | 8 | ||
7 | UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" | 9 | UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" |
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 9cbce243..10d2f293 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc | |||
@@ -18,10 +18,10 @@ do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" | |||
18 | # Default sysfw.itb on AM65x is for SR2.0 | 18 | # Default sysfw.itb on AM65x is for SR2.0 |
19 | BBMULTICONFIG += "k3r5-sr2" | 19 | BBMULTICONFIG += "k3r5-sr2" |
20 | do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | 20 | do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" |
21 | IMAGE_BOOT_FILES += "sysfw.itb" | 21 | IMAGE_BOOT_FILES += "sysfw.itb sysfw-am65x_sr2-${SYSFW_SUFFIX}-evm.itb" |
22 | 22 | ||
23 | # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 | 23 | # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 |
24 | IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" | 24 | IMAGE_BOOT_FILES += "sysfw-am65x-${SYSFW_SUFFIX}-evm.itb" |
25 | 25 | ||
26 | TFA_BOARD = "generic" | 26 | TFA_BOARD = "generic" |
27 | 27 | ||
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index cde768df..ee995fa5 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -55,26 +55,26 @@ SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" | |||
55 | SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" | 55 | SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" |
56 | SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" | 56 | SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" |
57 | 57 | ||
58 | SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 58 | SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
59 | SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | 59 | SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
60 | SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" | 60 | SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
61 | SYSFW_SYMLINK ?= "sysfw.itb" | 61 | SYSFW_SYMLINK ?= "sysfw.itb" |
62 | 62 | ||
63 | SYSFW_VBINARY:am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 63 | SYSFW_VBINARY:am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
64 | SYSFW_VBINARY:am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 64 | SYSFW_VBINARY:am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
65 | SYSFW_VBINARY:am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 65 | SYSFW_VBINARY:am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
66 | SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 66 | SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
67 | SYSFW_VBINARY:j721e-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 67 | SYSFW_VBINARY:j721e-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
68 | SYSFW_VBINARY:j721e-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 68 | SYSFW_VBINARY:j721e-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
69 | SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 69 | SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
70 | 70 | ||
71 | SYSFW_IMAGE:am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 71 | SYSFW_IMAGE:am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
72 | SYSFW_IMAGE:am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 72 | SYSFW_IMAGE:am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
73 | SYSFW_IMAGE:am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 73 | SYSFW_IMAGE:am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
74 | SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 74 | SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
75 | SYSFW_IMAGE:j721e-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 75 | SYSFW_IMAGE:j721e-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
76 | SYSFW_IMAGE:j721e-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 76 | SYSFW_IMAGE:j721e-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
77 | SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" | 77 | SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" |
78 | 78 | ||
79 | CFLAGS[unexport] = "1" | 79 | CFLAGS[unexport] = "1" |
80 | LDFLAGS[unexport] = "1" | 80 | LDFLAGS[unexport] = "1" |