From: Andrej Valek <[email protected]>

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 <[email protected]>
Signed-off-by: Walter Schweizer <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>

Backport of 27fbbeaf972bb7e2535c1b23375cfa9d66b69db6 in master branch
Signed-off-by: Remi Peuvergne <[email protected]>
---
 meta/classes/kernel-fitimage.bbclass | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 945914af44..ab483c383b 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -423,22 +423,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
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182860): 
https://lists.openembedded.org/g/openembedded-core/message/182860
Mute This Topic: https://lists.openembedded.org/mt/99548197/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to