On Thu, Jun 29, 2017 at 9:01 PM, Andrea Galbusera <[email protected]> wrote:
> This commit allow wic generated images to work when we want u-boot to > load the kernel image. > > Augment IMAGE_BOOT_FILES with the proper entries when KERNEL_IMAGETYPE > is "uImage". More specifically add u-boot image and boot.scr to deployed > files > and give the proper name to the kernel image accordingly. > > Signed-off-by: Andrea Galbusera <[email protected]> > --- > conf/machine/include/rpi-base.inc | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi- > base.inc > index 4a0ea2a..71bb071 100644 > --- a/conf/machine/include/rpi-base.inc > +++ b/conf/machine/include/rpi-base.inc > @@ -83,7 +83,9 @@ def make_dtb_boot_files(d): > > IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ > ${@make_dtb_boot_files(d)} \ > - ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE} \ > + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', > '${KERNEL_IMAGETYPE}', '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ > + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', > 'u-boot.bin;${SDIMG_KERNELIMAGE}', '', d)} \ > + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', > 'boot.scr;boot.scr', '', d)} \ > " > > # The kernel image is installed into the FAT32 boot partition and does > not need > Merged to master. Thanks. -- Andrei Gherzan
-- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
