Patchwork [meta-fsl-arm-extra] u-boot-script-boundary: handle the case where MACHINE=imx6sabrelite

login
register
mail settings
Submitter Eric BENARD
Date July 18, 2013, 12:39 p.m.
Message ID <1374151162-23069-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/53951/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Eric BENARD - July 18, 2013, 12:39 p.m.
else the build fails with :
uboot-mkimage: Can't open board/boundary/imx6qsabrelite/6x_bootscript: No such file or directory

Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Eric Nelson <eric.nelson@boundarydevices.com>
---
 recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Otavio Salvador - July 18, 2013, 12:57 p.m.
On Thu, Jul 18, 2013 at 9:39 AM, Eric Bénard <eric@eukrea.com> wrote:
> else the build fails with :
> uboot-mkimage: Can't open board/boundary/imx6qsabrelite/6x_bootscript: No such file or directory
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Eric Nelson <eric.nelson@boundarydevices.com>

Good catch!

> ---
>  recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> index 4d5e7db..2088a4f 100644
> --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> @@ -14,12 +14,16 @@ S = "${WORKDIR}/git"
>  inherit deploy
>
>  do_mkimage () {
> +    # workaround the case where MACHINE=imx6qsabrelite
> +    if [ ! -d board/boundary/${MACHINE} ]; then
> +        mkdir board/boundary/${MACHINE}
> +    fi

I just didn't understand why you create this directory as below you
use nitrogen one?

>      uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
> -                   -n "boot script" -d board/boundary/${MACHINE}/6x_bootscript.txt \
> +                   -n "boot script" -d board/boundary/nitrogen6x/6x_bootscript.txt \
>                     board/boundary/${MACHINE}/6x_bootscript
>
>      uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
> -                   -n "upgrade script" -d board/boundary/${MACHINE}/6x_upgrade.txt \
> +                   -n "upgrade script" -d board/boundary/nitrogen6x/6x_upgrade.txt \
>                     board/boundary/${MACHINE}/6x_upgrade
>  }

Seem fine.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
Eric BENARD - July 18, 2013, 12:58 p.m.
Le Thu, 18 Jul 2013 09:57:22 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Thu, Jul 18, 2013 at 9:39 AM, Eric Bénard <eric@eukrea.com> wrote:
> > else the build fails with :
> > uboot-mkimage: Can't open board/boundary/imx6qsabrelite/6x_bootscript: No such file or directory
> >
> > Signed-off-by: Eric Bénard <eric@eukrea.com>
> > Cc: Eric Nelson <eric.nelson@boundarydevices.com>
> 
> Good catch!
> 
> > ---
> >  recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> > index 4d5e7db..2088a4f 100644
> > --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> > +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> > @@ -14,12 +14,16 @@ S = "${WORKDIR}/git"
> >  inherit deploy
> >
> >  do_mkimage () {
> > +    # workaround the case where MACHINE=imx6qsabrelite
> > +    if [ ! -d board/boundary/${MACHINE} ]; then
> > +        mkdir board/boundary/${MACHINE}
> > +    fi
> 
> I just didn't understand why you create this directory as below you
> use nitrogen one?
> 
because I use the nitrogen one for the .txt but the ${MACHINE} one for
the results in order not to make many changes to the .bb as I assume
imx6sabrelite is due to disapear in a short future.

> >      uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
> > -                   -n "boot script" -d board/boundary/${MACHINE}/6x_bootscript.txt \
> > +                   -n "boot script" -d board/boundary/nitrogen6x/6x_bootscript.txt \
> >                     board/boundary/${MACHINE}/6x_bootscript
> >
> >      uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
> > -                   -n "upgrade script" -d board/boundary/${MACHINE}/6x_upgrade.txt \
> > +                   -n "upgrade script" -d board/boundary/nitrogen6x/6x_upgrade.txt \
> >                     board/boundary/${MACHINE}/6x_upgrade
> >  }
> 
> Seem fine.
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://projetos.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
Otavio Salvador - July 18, 2013, 1:01 p.m.
On Thu, Jul 18, 2013 at 9:58 AM, Eric Bénard <eric@eukrea.com> wrote:
> Le Thu, 18 Jul 2013 09:57:22 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
>> On Thu, Jul 18, 2013 at 9:39 AM, Eric Bénard <eric@eukrea.com> wrote:
>> > else the build fails with :
>> > uboot-mkimage: Can't open board/boundary/imx6qsabrelite/6x_bootscript: No such file or directory
>> >
>> > Signed-off-by: Eric Bénard <eric@eukrea.com>
>> > Cc: Eric Nelson <eric.nelson@boundarydevices.com>
>>
>> Good catch!
>>
>> > ---
>> >  recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    8 ++++++--
>> >  1 file changed, 6 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
>> > index 4d5e7db..2088a4f 100644
>> > --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
>> > +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
>> > @@ -14,12 +14,16 @@ S = "${WORKDIR}/git"
>> >  inherit deploy
>> >
>> >  do_mkimage () {
>> > +    # workaround the case where MACHINE=imx6qsabrelite
>> > +    if [ ! -d board/boundary/${MACHINE} ]; then
>> > +        mkdir board/boundary/${MACHINE}
>> > +    fi
>>
>> I just didn't understand why you create this directory as below you
>> use nitrogen one?
>>
> because I use the nitrogen one for the .txt but the ${MACHINE} one for
> the results in order not to make many changes to the .bb as I assume
> imx6sabrelite is due to disapear in a short future.

Makes sense :-)

>> >      uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
>> > -                   -n "boot script" -d board/boundary/${MACHINE}/6x_bootscript.txt \
>> > +                   -n "boot script" -d board/boundary/nitrogen6x/6x_bootscript.txt \
>> >                     board/boundary/${MACHINE}/6x_bootscript
>> >
>> >      uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
>> > -                   -n "upgrade script" -d board/boundary/${MACHINE}/6x_upgrade.txt \
>> > +                   -n "upgrade script" -d board/boundary/nitrogen6x/6x_upgrade.txt \
>> >                     board/boundary/${MACHINE}/6x_upgrade
>> >  }
>>
>> Seem fine.
>>
>> --
>> Otavio Salvador                             O.S. Systems
>> http://www.ossystems.com.br        http://projetos.ossystems.com.br
>> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
>



--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
Otavio Salvador - July 18, 2013, 1:05 p.m.
On Thu, Jul 18, 2013 at 9:39 AM, Eric Bénard <eric@eukrea.com> wrote:
> else the build fails with :
> uboot-mkimage: Can't open board/boundary/imx6qsabrelite/6x_bootscript: No such file or directory
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Eric Nelson <eric.nelson@boundarydevices.com>

Applied. Thanks for finding this.

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

Patch

diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
index 4d5e7db..2088a4f 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -14,12 +14,16 @@  S = "${WORKDIR}/git"
 inherit deploy
 
 do_mkimage () {
+    # workaround the case where MACHINE=imx6qsabrelite
+    if [ ! -d board/boundary/${MACHINE} ]; then
+        mkdir board/boundary/${MACHINE}
+    fi
     uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
-                   -n "boot script" -d board/boundary/${MACHINE}/6x_bootscript.txt \
+                   -n "boot script" -d board/boundary/nitrogen6x/6x_bootscript.txt \
                    board/boundary/${MACHINE}/6x_bootscript
 
     uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
-                   -n "upgrade script" -d board/boundary/${MACHINE}/6x_upgrade.txt \
+                   -n "upgrade script" -d board/boundary/nitrogen6x/6x_upgrade.txt \
                    board/boundary/${MACHINE}/6x_upgrade
 }