[PATCH] u-boot.inc: make sure all counter variables are properly unset

[PATCH] u-boot.inc: make sure all counter variables are properly unset

[Carlos Rafael Giani]

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>
---
 meta/recipes-bsp/u-boot/u-boot.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 7053a56..88e239d 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}
-- 
1.9.1

Re: [PATCH] u-boot.inc: make sure all counter variables are properly unset

[Otavio Salvador]

On Mon, Apr 20, 2015 at 4:17 PM, Carlos Rafael Giani
<dv@pseudoterminal.org> wrote:
> 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>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Richard, this needs to be applied into master and fido branches.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] u-boot.inc: make sure all counter variables are properly unset

[Carlos Rafael Giani]

It is in master, which is nice. But not in fido? Is it too late for 
fixes like these? If so, I'll have to backport this fix into 
meta-fsl-arm-extra for the cubox-i uboot.
Otherwise, if it is to be reviewed for inclusion into fido, I'm fine 
with that.

Am 2015-04-20 um 21:31 schrieb Otavio Salvador:
> On Mon, Apr 20, 2015 at 4:17 PM, Carlos Rafael Giani
> <dv@pseudoterminal.org> wrote:
>> 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>
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Richard, this needs to be applied into master and fido branches.
>

Re: [PATCH] u-boot.inc: make sure all counter variables are properly unset

[Otavio Salvador]

On Thu, Apr 23, 2015 at 3:31 PM, Carlos Rafael Giani
<dv@pseudoterminal.org> wrote:
> It is in master, which is nice. But not in fido? Is it too late for fixes
> like these? If so, I'll have to backport this fix into meta-fsl-arm-extra
> for the cubox-i uboot.
> Otherwise, if it is to be reviewed for inclusion into fido, I'm fine with
> that.

Richard, can you cherry-pick this for fido? it is breaking
meta-fsl-arm-extra boards.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] u-boot.inc: make sure all counter variables are properly unset

[Tom Rini]

On Mon, Apr 20, 2015 at 09:17:08PM +0200, Carlos Rafael Giani wrote:

> 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>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom