summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-fitimage.bbclass
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2021-10-16 22:01:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-18 13:48:17 +0100
commitea92f2ee9100c945ea3d9ebddff1214d86ac4c02 (patch)
tree377f9aebdecbeffd9d3a3636a67c5bedd03000ed /meta/classes/kernel-fitimage.bbclass
parent2b5f5e295e9a2765809929fda4e0a76c77e4a6fe (diff)
downloadpoky-ea92f2ee9100c945ea3d9ebddff1214d86ac4c02.tar.gz
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 <andrej.valek@siemens.com> Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-fitimage.bbclass')
-rw-r--r--meta/classes/kernel-fitimage.bbclass17
1 files changed, 1 insertions, 16 deletions
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() {
495 fitimage_emit_section_maint $1 imagestart 495 fitimage_emit_section_maint $1 imagestart
496 496
497 uboot_prep_kimage 497 uboot_prep_kimage
498 498 fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
499 if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
500 initramfs_bundle_path="arch/"${UBOOT_ARCH}"/boot/"${KERNEL_IMAGETYPE_REPLACEMENT}".initramfs"
501 if [ -e "$initramfs_bundle_path" ]; then
502
503 #
504 # Include the kernel/rootfs bundle.
505 #
506
507 fitimage_emit_section_kernel $1 $kernelcount "$initramfs_bundle_path" "$linux_comp"
508 else
509 bbwarn "$initramfs_bundle_pat not found."
510 fi
511 else
512 fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
513 fi
514 499
515 # 500 #
516 # Step 2: Prepare a DTB image section 501 # Step 2: Prepare a DTB image section