aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2015-04-20 21:17:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-24 11:05:55 +0100
commit50233dc2544fe8eeee69a5dc07f505db29fc9e0e (patch)
tree99944fe8e39892b704ec8376e1f864b10efa8eb7 /meta/recipes-bsp/u-boot
parent166f2587468ae71988c610858aad3f7ef67eccba (diff)
downloadopenembedded-core-contrib-50233dc2544fe8eeee69a5dc07f505db29fc9e0e.tar.gz
u-boot.inc: make sure all counter variables are properly unset
The script does "i == j" checks to retrieve the config <-> type pairs from the UBOOT_MACHINE and UBOOT_CONFIG lists. This check however requires both j and i to be initially unset. Ensure this by explicitely unsetting i. This fixes broken u-boot SPL installations with SolidRun machines (the SPL wasn't being installed and deployed.) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 7053a567865..88e239d66a5 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -78,6 +78,7 @@ do_compile () {
done
unset j
done
+ unset i
else
oe_runmake ${UBOOT_MACHINE}
oe_runmake ${UBOOT_MAKE_TARGET}
@@ -101,6 +102,7 @@ do_install () {
done
unset j
done
+ unset i
else
install -d ${D}/boot
install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
@@ -129,6 +131,7 @@ do_install () {
done
unset j
done
+ unset i
else
install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
@@ -162,6 +165,7 @@ do_deploy () {
done
unset j
done
+ unset i
else
install -d ${DEPLOYDIR}
install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
@@ -193,6 +197,7 @@ do_deploy () {
done
unset j
done
+ unset i
else
install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}