[oe-commits] [openembedded-core] 26/26: kernel.fitimage.bbclass: remove ramdisk_ctype

git at git.openembedded.org git at git.openembedded.org
Thu Sep 26 20:39:22 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 8a9b3bd447ce1d7f6e958eec4514eea0af4dca54
Author: Heiko Schocher <hs at denx.de>
AuthorDate: Fri Sep 20 06:48:26 2019 +0200

    kernel.fitimage.bbclass: remove ramdisk_ctype
    
    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 at denx.de>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-fitimage.bbclass | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index b51882d..1bcb09c 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -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 at 1 {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list