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