summaryrefslogtreecommitdiffstats
path: root/meta
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:06:54 +0100
commitb80a8feb714908fa0ef1a0472d16e9e1e77e269d (patch)
tree4a9216d91d60ef84998e43434e514147ae165c4c /meta
parent781165b071babb888f46a4e1d15880df924c65f6 (diff)
downloadpoky-b80a8feb714908fa0ef1a0472d16e9e1e77e269d.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.) (From OE-Core rev: 50233dc2544fe8eeee69a5dc07f505db29fc9e0e) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 7053a56786..88e239d66a 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 () {
78 done 78 done
79 unset j 79 unset j
80 done 80 done
81 unset i
81 else 82 else
82 oe_runmake ${UBOOT_MACHINE} 83 oe_runmake ${UBOOT_MACHINE}
83 oe_runmake ${UBOOT_MAKE_TARGET} 84 oe_runmake ${UBOOT_MAKE_TARGET}
@@ -101,6 +102,7 @@ do_install () {
101 done 102 done
102 unset j 103 unset j
103 done 104 done
105 unset i
104 else 106 else
105 install -d ${D}/boot 107 install -d ${D}/boot
106 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} 108 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
@@ -129,6 +131,7 @@ do_install () {
129 done 131 done
130 unset j 132 unset j
131 done 133 done
134 unset i
132 else 135 else
133 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} 136 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
134 ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} 137 ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
@@ -162,6 +165,7 @@ do_deploy () {
162 done 165 done
163 unset j 166 unset j
164 done 167 done
168 unset i
165 else 169 else
166 install -d ${DEPLOYDIR} 170 install -d ${DEPLOYDIR}
167 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} 171 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
@@ -193,6 +197,7 @@ do_deploy () {
193 done 197 done
194 unset j 198 unset j
195 done 199 done
200 unset i
196 else 201 else
197 install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} 202 install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
198 rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK} 203 rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}