kernel-fitimage: use correct kernel image

Even if initramfs_bundle_path was used, a wrong compression was reflected
in output its template file. Use linux.bin as universal kernel image.
The linux.bin file covers both cases because it's beying created from
vmlinux.

We know, that vmlinux is created inside compressed directory already,
so no external compression will be used.

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport of 27fbbeaf972bb7e2535c1b23375cfa9d66b69db6 in master branch
Signed-off-by: Remi Peuvergne <remi.peuvergne@non.se.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 3b231386281465e3b22f0fd8683c608c921da736..b88d7dbe4b36d711d8ed7cb5799b8f2028e31f2c 100644 (file)
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -431,22 +431,7 @@ fitimage_assemble() {
        fitimage_emit_section_maint ${1} imagestart
 
        uboot_prep_kimage
-
-       if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
-               initramfs_bundle_path="arch/"${UBOOT_ARCH}"/boot/"${KERNEL_IMAGETYPE_REPLACEMENT}".initramfs"
-               if [ -e "${initramfs_bundle_path}" ]; then
-
-                       #
-                       # Include the kernel/rootfs bundle.
-                       #
-
-                       fitimage_emit_section_kernel ${1} "${kernelcount}" "${initramfs_bundle_path}" "${linux_comp}"
-               else
-                       bbwarn "${initramfs_bundle_path} not found."
-               fi
-       else
-               fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin "${linux_comp}"
-       fi
+       fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
 
        #
        # Step 2: Prepare a DTB image section