diff options
author | Garrett Giordano <ggiordano@phytec.com> | 2023-10-05 11:36:29 -0700 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-10-17 21:58:11 -0500 |
commit | 1b96fccda339a4578a1ab78a71c58cc3c7698642 (patch) | |
tree | cb3346f9d4414ccaadc3dc70a10510a8708588a9 | |
parent | 1690e3fe509855e779dde22772f2fb055162e20d (diff) | |
download | meta-ti-1b96fccda339a4578a1ab78a71c58cc3c7698642.tar.gz |
uboot: Handle UBOOT_CONFIG for multiple R5 defconfigs
Currently the do_compile step fails if we try to implement UBOOT_CONFIG
in an attempt to build U-Boot with multiple R5 defconfigs.
This commit adds a condition to handle linking the UBOOT_BINARY if
UBOOT_CONFIG is used in place of UBOOT_MACHINE.
Signed-off-by: Garrett Giordano <ggiordano@phytec.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 22 |
1 files changed, 20 insertions, 2 deletions
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 58ee6525..0b8025f4 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 | |||
@@ -106,8 +106,26 @@ UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}" | |||
106 | UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" | 106 | UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" |
107 | 107 | ||
108 | do_compile:append:k3r5 () { | 108 | do_compile:append:k3r5 () { |
109 | if ! [ -f ${B}/${UBOOT_BINARY} ]; then | 109 | if [ -n "${UBOOT_CONFIG}" ]; |
110 | ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY} | 110 | then |
111 | for config in ${UBOOT_MACHINE}; do | ||
112 | i=$(expr $i + 1); | ||
113 | for type in ${UBOOT_CONFIG}; do | ||
114 | j=$(expr $j + 1); | ||
115 | if [ $j -eq $i ]; | ||
116 | then | ||
117 | if ! [ -L ${B}/${config}/${UBOOT_BINARY} ] && ! [ -f ${B}/${config}/${UBOOT_BINARY} ]; then | ||
118 | ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARY} | ||
119 | fi | ||
120 | fi | ||
121 | done | ||
122 | unset j | ||
123 | done | ||
124 | unset i | ||
125 | else | ||
126 | if ! [ -f ${B}/${UBOOT_BINARY} ]; then | ||
127 | ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY} | ||
128 | fi | ||
111 | fi | 129 | fi |
112 | } | 130 | } |
113 | 131 | ||