diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2023-09-22 06:34:09 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-09-25 09:58:09 -0500 |
commit | de4310f4ffa6afee7eb01924ddd6ec375dca0fde (patch) | |
tree | bac2ec5415018780bb90dde721a3c8732fe1d4fd | |
parent | 556bda07c9be9cb68c356a2c43222d7429cb5d0c (diff) | |
download | meta-ti-de4310f4ffa6afee7eb01924ddd6ec375dca0fde.tar.gz |
k3r5: u-boot: prevent overlapping deployed SPL symlinks
Make sure shortname R5 SPL symlink is not the same as the main K3 SPL
one, as they will overlap/overwrite each other when deployed into a
common location. Latest code in master now checks for this and errors
out.
Also remove unused UBOOT_SPI_* variables.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/conf/machine/include/k3r5.inc | 4 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 15 |
2 files changed, 3 insertions, 16 deletions
diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 3619d300..184d3a09 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc | |||
@@ -19,9 +19,9 @@ SPL_SUFFIX = "bin" | |||
19 | SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" | 19 | SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" |
20 | SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}" | 20 | SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}" |
21 | UBOOT_SUFFIX = "bin" | 21 | UBOOT_SUFFIX = "bin" |
22 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | 22 | UBOOT_BINARY = "u-boot-r5spl.${UBOOT_SUFFIX}" |
23 | UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | 23 | UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" |
24 | UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" | 24 | UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}" |
25 | 25 | ||
26 | PACKAGECONFIG:pn-u-boot-ti-staging = "" | 26 | PACKAGECONFIG:pn-u-boot-ti-staging = "" |
27 | PACKAGECONFIG:pn-u-boot-ti-mainline = "" | 27 | PACKAGECONFIG:pn-u-boot-ti-mainline = "" |
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 92eaf0cc..4f72c867 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | |||
@@ -82,19 +82,6 @@ SPL_UART_BINARY:k3r5 = "" | |||
82 | SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" | 82 | SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" |
83 | SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" | 83 | SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" |
84 | 84 | ||
85 | # SPI NOR Flash binaries | ||
86 | UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin" | ||
87 | UBOOT_SPI_BINARY = "u-boot.img" | ||
88 | UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph" | ||
89 | |||
90 | # SPI NOR Flash deployed images | ||
91 | UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin" | ||
92 | UBOOT_SPI_SPL_SYMLINK = "u-boot-spl-${MACHINE}.bin" | ||
93 | UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" | ||
94 | UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img" | ||
95 | UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph" | ||
96 | UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph" | ||
97 | |||
98 | # HS XLD | 85 | # HS XLD |
99 | UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER" | 86 | UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER" |
100 | UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}" | 87 | UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}" |
@@ -117,7 +104,7 @@ UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" | |||
117 | 104 | ||
118 | do_compile:append:k3r5 () { | 105 | do_compile:append:k3r5 () { |
119 | if ! [ -f ${B}/${UBOOT_BINARY} ]; then | 106 | if ! [ -f ${B}/${UBOOT_BINARY} ]; then |
120 | ln -s spl/${UBOOT_BINARY} ${B}/${UBOOT_BINARY} | 107 | ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY} |
121 | fi | 108 | fi |
122 | } | 109 | } |
123 | 110 | ||