kernel-uboot.bbclass: Use vmlinux.initramfs when INITRAMFS_IMAGE_BUNDLE set

vmlinux file doesnot have the initramfs image when INITRAMFS_IMAGE_BUNDLE was set.
Use vmlinux.initramfs in uboot_prep_kimage when INITRAMFS_IMAGE_BUNDLE set
based on the implementation in kernel.bbclass do_bundle_initramfs function,
https://github.com/openembedded/openembedded-core/blob/master/meta/classes/kernel.bbclass#L316-L317
to be able to use proper linux.bin file in creation of fitImage.

Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 2daa068298950fa7f2d0aaa232c4c805e4f9fb46..2facade818238528590ae2529d83ade0eb7030bb 100644 (file)
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -15,6 +15,12 @@ uboot_prep_kimage() {
                linux_comp="none"
        else
                vmlinux_path="vmlinux"
+               # Use vmlinux.initramfs for linux.bin when INITRAMFS_IMAGE_BUNDLE set
+               # As per the implementation in kernel.bbclass.
+               # See do_bundle_initramfs function
+               if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ] && [ -e vmlinux.initramfs ]; then
+                       vmlinux_path="vmlinux.initramfs"
+               fi
                linux_suffix="${FIT_KERNEL_COMP_ALG_EXTENSION}"
                linux_comp="${FIT_KERNEL_COMP_ALG}"
        fi