<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Jun 29, 2017 at 9:01 PM, Andrea Galbusera <span dir="ltr"><<a href="mailto:gizero@gmail.com" target="_blank">gizero@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This commit allow wic generated images to work when we want u-boot to<br>
load the kernel image.<br>
<br>
Augment IMAGE_BOOT_FILES with the proper entries when KERNEL_IMAGETYPE<br>
is "uImage". More specifically add u-boot image and boot.scr to deployed files<br>
and give the proper name to the kernel image accordingly.<br>
<br>
Signed-off-by: Andrea Galbusera <<a href="mailto:gizero@gmail.com">gizero@gmail.com</a>><br>
---<br>
 conf/machine/include/rpi-base.<wbr>inc | 4 +++-<br>
 1 file changed, 3 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/conf/machine/include/rpi-<wbr>base.inc b/conf/machine/include/rpi-<wbr>base.inc<br>
index 4a0ea2a..71bb071 100644<br>
--- a/conf/machine/include/rpi-<wbr>base.inc<br>
+++ b/conf/machine/include/rpi-<wbr>base.inc<br>
@@ -83,7 +83,9 @@ def make_dtb_boot_files(d):<br>
<br>
 IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \<br>
                  ${@make_dtb_boot_files(d)} \<br>
-                 ${KERNEL_IMAGETYPE};${SDIMG_<wbr>KERNELIMAGE} \<br>
+                 ${@bb.utils.contains('KERNEL_<wbr>IMAGETYPE', 'uImage', '${KERNEL_IMAGETYPE}', '${KERNEL_IMAGETYPE};${SDIMG_<wbr>KERNELIMAGE}', d)} \<br>
+                 ${@bb.utils.contains('KERNEL_<wbr>IMAGETYPE', 'uImage', 'u-boot.bin;${SDIMG_<wbr>KERNELIMAGE}', '', d)} \<br>
+                 ${@bb.utils.contains('KERNEL_<wbr>IMAGETYPE', 'uImage', 'boot.scr;boot.scr', '', d)} \<br>
                  "<br>
<br>
 # The kernel image is installed into the FAT32 boot partition and does not need<br></blockquote><div><br></div><div>Merged to master. Thanks.</div><div><br></div><div>--</div><div>Andrei Gherzan </div></div></div></div>