diff options
author | Ryan Eatmon <reatmon@ti.com> | 2023-04-06 16:18:57 -0500 |
---|---|---|
committer | LCPD Automation Script <lcpdbld@list.ti.com> | 2023-05-15 13:45:43 -0500 |
commit | 65a23ac46e06c056ef87e2e279359a1ec6f0acca (patch) | |
tree | 5404f390f36a0e5c3753bfa43300118fab8d856a /meta-ti-bsp/conf/machine | |
parent | ef327a8c73f0e8465c0f07d7410f49bb3c580dc0 (diff) | |
download | meta-ti-65a23ac46e06c056ef87e2e279359a1ec6f0acca.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>
Diffstat (limited to 'meta-ti-bsp/conf/machine')
-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 |
3 files changed, 6 insertions, 2 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 | ||