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.

(From OE-Core rev: 3f8a49c4f276c65ccec149e3dc2e06d74c3c5a80)

Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit e0a4e45e067d9fdb67a7d223aea463f259469035)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 2daa068298..2facade818 100644
--- 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