[yocto] [meta-raspberrypi][PATCH 3/3] sdcard_image-rpi.bbclass: Include boot script when using u-boot

[Andrei Gherzan]

Hi Paul,

On Mon, Jul 11, 2016 at 12:17:56AM +0100,Paul Barker wrote:
> Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
> ---
>  classes/sdcard_image-rpi.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
> index 6960aca..20be56f 100644
> --- a/classes/sdcard_image-rpi.bbclass
> +++ b/classes/sdcard_image-rpi.bbclass
> @@ -55,7 +55,7 @@ IMAGE_DEPENDS_rpi-sdimg = " \
>  			dosfstools-native \
>  			virtual/kernel:do_deploy \
>  			${IMAGE_BOOTLOADER} \
> -			${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot', '',d)} \
> +			${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot u-boot-scr', '',d)} \

Should uboot RDEPEND on u-boot-scr? In my head this would make more
sense and we can avoid this change if so.

>  			"
>
>  # SD card image name
> @@ -128,6 +128,7 @@ IMAGE_CMD_rpi-sdimg () {
>  	"uImage")
>  		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE}
>  		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
> +		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr
>  		;;
>  	*)
>  		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
> --
> 2.1.4
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

--
Andrei Gherzan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20160713/82fa236f/attachment.pgp>