Patchwork [meta-fsl-arm-extra] u-boot-script-boundary: Fix build for imx6qsabrelite

login
register
mail settings
Submitter Christoph Settgast
Date July 25, 2014, 8:36 a.m.
Message ID <1406277371-9939-1-git-send-email-christoph.settgast@methodpark.de>
Download mbox | patch
Permalink /patch/76651/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Christoph Settgast - July 25, 2014, 8:36 a.m.
When MACHINE was set to imx6qsabrelite no bootscript.txt was found.
Fix the same for the 6x_upgrade script while at it. There is only
one upgrade script shared by all boards, so use it independent of
the MACHINE.

Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de>
---
 recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Gary Thomas - July 25, 2014, 12:14 p.m.
On 2014-07-25 02:36, Christoph Settgast wrote:
> When MACHINE was set to imx6qsabrelite no bootscript.txt was found.
> Fix the same for the 6x_upgrade script while at it. There is only
> one upgrade script shared by all boards, so use it independent of
> the MACHINE.

How does this patch fix the problem mentioned above?  It seems to only
affect the BOOTSCRIPT value when building for nitrogen6x, not imx6qsabrelite.

>
> Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de>
> ---
>   recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    4 ++--
>   1 file changed, 2 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 df4b76f..53b9c9a 100644
> --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> @@ -13,10 +13,10 @@ S = "${WORKDIR}/git"
>   inherit deploy
>
>   BOOTSCRIPT = "${S}/board/boundary/${MACHINE}/6x_bootscript-yocto.txt"
> +BOOTSCRIPT_nitrogen6x = "${S}/board/boundary/nitrogen6x/6x_bootscript-yocto.txt"
>   BOOTSCRIPT_nitrogen6x-lite = "${S}/board/boundary/nit6xlite/6x_bootscript-yocto.txt"
>
> -UPGRADESCRIPT = "${S}/board/boundary/${MACHINE}/6x_upgrade.txt"
> -UPGRADESCRIPT_nitrogen6x-lite = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
> +UPGRADESCRIPT = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
>
>   do_mkimage () {
>       # allow deploy to use the ${MACHINE} name to simplify things
>
Christoph Settgast - July 25, 2014, 12:26 p.m.
On 25.07.2014 14:14, Gary Thomas wrote:
>
> How does this patch fix the problem mentioned above?  It seems to only
> affect the BOOTSCRIPT value when building for nitrogen6x, not
> imx6qsabrelite.

The imx6qsabrelite machine definition is the same as nitrogen6x. It uses 
machineoverrides to do that. So for the BOOTSCRIPT bitbake will pick up 
the _nitrogen6x definition when building with machine imx6qsabrelite. 
See conf/machine/imx6qsabrelite.conf for the overrides.

To verify, simply run

MACHINE=imx6qsabrelite bitbake u-boot-script-boundary -e | grep ^BOOTSCRIPT

with and without the patch. It shows the correct BOOTSCRIPT path when 
the path is applied:

before:
BOOTSCRIPT=".../build/tmp/work/imx6qsabrelite-poky-linux-gnueabi/u-boot-script-boundary/v2014.01+gitAUTOINC+aed9475361-r0/git/board/boundary/imx6qsabrelite/6x_bootscript-yocto.txt"

after:
BOOTSCRIPT=".../build/tmp/work/imx6qsabrelite-poky-linux-gnueabi/u-boot-script-boundary/v2014.01+gitAUTOINC+aed9475361-r0/git/board/boundary/nitrogen6x/6x_bootscript-yocto.txt"


On a side note: as imx6qsabrelite and nitrogen6x use the same code, you 
can also build your images for imx6qsabrelite with MACHINE=nitrogen6x

>
>>
>> Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de>
>> ---
>>   recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    4 ++--
>>   1 file changed, 2 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 df4b76f..53b9c9a 100644
>> --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
>> +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
>> @@ -13,10 +13,10 @@ S = "${WORKDIR}/git"
>>   inherit deploy
>>
>>   BOOTSCRIPT = "${S}/board/boundary/${MACHINE}/6x_bootscript-yocto.txt"
>> +BOOTSCRIPT_nitrogen6x =
>> "${S}/board/boundary/nitrogen6x/6x_bootscript-yocto.txt"
>>   BOOTSCRIPT_nitrogen6x-lite =
>> "${S}/board/boundary/nit6xlite/6x_bootscript-yocto.txt"
>>
>> -UPGRADESCRIPT = "${S}/board/boundary/${MACHINE}/6x_upgrade.txt"
>> -UPGRADESCRIPT_nitrogen6x-lite =
>> "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
>> +UPGRADESCRIPT = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
>>
>>   do_mkimage () {
>>       # allow deploy to use the ${MACHINE} name to simplify things
>>
>
Eric Nelson - July 25, 2014, 2:46 p.m.
Thanks Christoph,

On 07/25/2014 01:36 AM, Christoph Settgast wrote:
> When MACHINE was set to imx6qsabrelite no bootscript.txt was found.
> Fix the same for the 6x_upgrade script while at it. There is only
> one upgrade script shared by all boards, so use it independent of
> the MACHINE.
> 
> Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de>
> ---
>  recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    4 ++--
>  1 file changed, 2 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 df4b76f..53b9c9a 100644
> --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
> @@ -13,10 +13,10 @@ S = "${WORKDIR}/git"
>  inherit deploy
>  
>  BOOTSCRIPT = "${S}/board/boundary/${MACHINE}/6x_bootscript-yocto.txt"
> +BOOTSCRIPT_nitrogen6x = "${S}/board/boundary/nitrogen6x/6x_bootscript-yocto.txt"
>  BOOTSCRIPT_nitrogen6x-lite = "${S}/board/boundary/nit6xlite/6x_bootscript-yocto.txt"
>  
> -UPGRADESCRIPT = "${S}/board/boundary/${MACHINE}/6x_upgrade.txt"
> -UPGRADESCRIPT_nitrogen6x-lite = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
> +UPGRADESCRIPT = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
>  
>  do_mkimage () {
>      # allow deploy to use the ${MACHINE} name to simplify things
> 
I thought I had done this before, but just re-tested, so:

Tested-By: Eric Nelson <eric.nelson@boundarydevices.com>

and

Acked-By: Eric Nelson <eric.nelson@boundarydevices.com>

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 df4b76f..53b9c9a 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -13,10 +13,10 @@  S = "${WORKDIR}/git"
 inherit deploy
 
 BOOTSCRIPT = "${S}/board/boundary/${MACHINE}/6x_bootscript-yocto.txt"
+BOOTSCRIPT_nitrogen6x = "${S}/board/boundary/nitrogen6x/6x_bootscript-yocto.txt"
 BOOTSCRIPT_nitrogen6x-lite = "${S}/board/boundary/nit6xlite/6x_bootscript-yocto.txt"
 
-UPGRADESCRIPT = "${S}/board/boundary/${MACHINE}/6x_upgrade.txt"
-UPGRADESCRIPT_nitrogen6x-lite = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
+UPGRADESCRIPT = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
 
 do_mkimage () {
     # allow deploy to use the ${MACHINE} name to simplify things