]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel.fitimage.bbclass: remove ramdisk_ctype
authorHeiko Schocher <hs@denx.de>
Fri, 20 Sep 2019 04:48:26 +0000 (06:48 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 27 Sep 2019 12:01:17 +0000 (13:01 +0100)
set in the ramdisk node the compression property
always to "none", as U-Boot nowadays since commit:

b1307f884a91 ("fit: Support compression for non-kernel components (e.g. FDT)")

decompress non kernel components. Setting compression
to the used comression algorithm now, will end in
fail of your kernel boot with the ramdisk.

This issue is fixed since commit:

bddd98573465 ("fit: Do not automatically decompress ramdisk images")

which now prints a warning in U-Boot, instead of decompressing
the ramdisk, but we should setup compression property correct.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/kernel-fitimage.bbclass

index b51882dce4c7418c188354c0b1a8f11e706ff701..1bcb09c59885178b0288ea61ceca609669345742 100644 (file)
@@ -207,7 +207,6 @@ EOF
 fitimage_emit_section_ramdisk() {
 
        ramdisk_csum="${FIT_HASH_ALG}"
-       ramdisk_ctype="none"
        ramdisk_loadline=""
        ramdisk_entryline=""
 
@@ -218,24 +217,6 @@ fitimage_emit_section_ramdisk() {
                ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;"
        fi
 
-       case $3 in
-               *.gz)
-                       ramdisk_ctype="gzip"
-                       ;;
-               *.bz2)
-                       ramdisk_ctype="bzip2"
-                       ;;
-               *.lzma)
-                       ramdisk_ctype="lzma"
-                       ;;
-               *.lzo)
-                       ramdisk_ctype="lzo"
-                       ;;
-               *.lz4)
-                       ramdisk_ctype="lz4"
-                       ;;
-       esac
-
        cat << EOF >> ${1}
                 ramdisk@${2} {
                         description = "${INITRAMFS_IMAGE}";
@@ -243,7 +224,7 @@ fitimage_emit_section_ramdisk() {
                         type = "ramdisk";
                         arch = "${UBOOT_ARCH}";
                         os = "linux";
-                        compression = "${ramdisk_ctype}";
+                        compression = "none";
                         ${ramdisk_loadline}
                         ${ramdisk_entryline}
                         hash@1 {