summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2025-10-07 15:52:49 -0500
committerRyan Eatmon <reatmon@ti.com>2025-10-14 07:39:53 -0500
commitb34f91575f131ef8caf7d1aebc838be398487a96 (patch)
tree2bdaead6ad213e12350df542f015320432d8948e
parente108e5424e1cffd58a0e8d540117d79dce85a8c7 (diff)
downloadmeta-ti-HEAD.tar.gz
u-boot: Make sure the build dir is unique for each UBOOT_CONFIGHEADmaster
Make the same changes as the corresponding oe-core patch. [1] [1] https://git.openembedded.org/openembedded-core/commit/?id=22e96b32b0be02ec0971c9334d4b1df7c9ef8d84 Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc60
1 files changed, 31 insertions, 29 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 27b0855b..4bead79b 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
@@ -143,43 +143,45 @@ uboot_compile_config_copy_binary:k3r5 () {
143 type=$2 143 type=$2
144 binary=$3 144 binary=$3
145 145
146 if ! [ -L ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then 146 builddir="${builddir}"
147 ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} 147
148 if ! [ -L ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
149 ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
148 fi 150 fi
149 151
150 if ! [ -L ${B}/${config}/${binary} ] && ! [ -f ${B}/${config}/${binary} ]; then 152 if ! [ -L ${B}/${builddir}/${binary} ] && ! [ -f ${B}/${builddir}/${binary} ]; then
151 ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${binary} 153 ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${binary}
152 fi 154 fi
153} 155}
154 156
155uboot_install_config:append () { 157uboot_install_config:append () {
156 if [ "x${SPL_UART_BINARY}" != "x" ]; then 158 if [ "x${SPL_UART_BINARY}" != "x" ]; then
157 install ${B}/${config}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type} 159 install ${B}/${builddir}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type}
158 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type} 160 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type}
159 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY} 161 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}
160 fi 162 fi
161 if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then 163 if [ -f ${B}/${builddir}/${SPL_HS_MLO_BINARY} ]; then
162 install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type} 164 install ${B}/${builddir}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
163 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type} 165 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type}
164 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY} 166 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}
165 fi 167 fi
166 if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then 168 if [ -f ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ]; then
167 install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type} 169 install ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
168 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type} 170 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type}
169 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY} 171 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}
170 fi 172 fi
171 if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then 173 if [ -f ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ]; then
172 install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type} 174 install ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type}
173 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type} 175 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type}
174 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY} 176 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}
175 fi 177 fi
176 if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then 178 if [ -f ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ]; then
177 install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type} 179 install ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type}
178 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type} 180 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type}
179 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY} 181 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
180 fi 182 fi
181 if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then 183 if [ -f ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ]; then
182 install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type} 184 install ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type}
183 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type} 185 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type}
184 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY} 186 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}
185 fi 187 fi
@@ -222,7 +224,7 @@ do_deploy:append:k3r5 () {
222} 224}
223 225
224uboot_deploy_config:append:k3r5 () { 226uboot_deploy_config:append:k3r5 () {
225 for f in ${B}/${config}/tiboot3-*.bin; do 227 for f in ${B}/${builddir}/tiboot3-*.bin; do
226 if [ -f "$f" ]; then 228 if [ -f "$f" ]; then
227 f_base=$(basename $f) 229 f_base=$(basename $f)
228 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type} 230 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
@@ -230,7 +232,7 @@ uboot_deploy_config:append:k3r5 () {
230 fi 232 fi
231 done 233 done
232 234
233 for f in ${B}/${config}/sysfw*.itb; do 235 for f in ${B}/${builddir}/sysfw*.itb; do
234 if [ -f "$f" ]; then 236 if [ -f "$f" ]; then
235 f_base=$(basename $f) 237 f_base=$(basename $f)
236 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type} 238 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
@@ -240,7 +242,7 @@ uboot_deploy_config:append:k3r5 () {
240} 242}
241 243
242uboot_deploy_config:append:am62lxx () { 244uboot_deploy_config:append:am62lxx () {
243 for f in ${B}/${config}/tiboot3-*.bin; do 245 for f in ${B}/${builddir}/tiboot3-*.bin; do
244 if [ -f "$f" ]; then 246 if [ -f "$f" ]; then
245 f_base=$(basename $f) 247 f_base=$(basename $f)
246 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type} 248 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
@@ -274,47 +276,47 @@ uboot_deploy:append:am62lxx () {
274uboot_deploy_config:append () { 276uboot_deploy_config:append () {
275 cd ${DEPLOYDIR} 277 cd ${DEPLOYDIR}
276 if [ "x${SPL_UART_BINARY}" != "x" ]; then 278 if [ "x${SPL_UART_BINARY}" != "x" ]; then
277 install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type} 279 install ${B}/${builddir}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
278 rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} 280 rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
279 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type} 281 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
280 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY} 282 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
281 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type} 283 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
282 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK} 284 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
283 fi 285 fi
284 if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then 286 if [ -f ${B}/${builddir}/${SPL_HS_MLO_BINARY} ]; then
285 install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type} 287 install ${B}/${builddir}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
286 rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK} 288 rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
287 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type} 289 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
288 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK} 290 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
289 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type} 291 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
290 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY} 292 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
291 fi 293 fi
292 if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then 294 if [ -f ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ]; then
293 install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type} 295 install ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
294 rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} 296 rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
295 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} 297 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
296 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} 298 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
297 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type} 299 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type}
298 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} 300 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
299 fi 301 fi
300 if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then 302 if [ -f ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ]; then
301 install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type} 303 install ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
302 rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} 304 rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
303 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} 305 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
304 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} 306 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
305 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type} 307 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type}
306 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} 308 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
307 fi 309 fi
308 if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then 310 if [ -f ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ]; then
309 install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type} 311 install ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
310 rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} 312 rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
311 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} 313 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
312 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} 314 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
313 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type} 315 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type}
314 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} 316 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
315 fi 317 fi
316 if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then 318 if [ -f ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ]; then
317 install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type} 319 install ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
318 rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} 320 rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
319 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} 321 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
320 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} 322 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}