From ea92f2ee9100c945ea3d9ebddff1214d86ac4c02 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Sat, 16 Oct 2021 22:01:47 +0200 Subject: 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. (From OE-Core rev: 27fbbeaf972bb7e2535c1b23375cfa9d66b69db6) Signed-off-by: Andrej Valek Signed-off-by: Walter Schweizer Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'meta/classes/kernel-fitimage.bbclass') diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 886ed13029..8718ce7e16 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -495,22 +495,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_pat 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 -- cgit v1.2.3-54-g00ecf