kernel-fitimage: Use compressed ramdisks in FIT images if available

kernel-fitimage:fitimage_assemble() was calling copy_initramfs from
kernel.bbclass which decompresses the initramfs cpio.  Assume that if
INITRAMFS_FSTYPES includes a compressed cpio, that is what it desired in
the FIT image.

Signed-off-by: Rick Altherr <raltherr@google.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index c15ded523ce1f1362ac55268b5978bc8bdbcac83..1c3b4b7fb370b0bb5a74b3b194e94d0441b80c0c 100644 (file)
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -178,6 +178,7 @@ EOF
 fitimage_emit_section_ramdisk() {
 
        ramdisk_csum="sha1"
+       ramdisk_ctype="none"
        ramdisk_loadline=""
        ramdisk_entryline=""
 
@@ -188,14 +189,32 @@ 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 = "ramdisk image";
+                        description = "${INITRAMFS_IMAGE}";
                         data = /incbin/("${3}");
                         type = "ramdisk";
                         arch = "${UBOOT_ARCH}";
                         os = "linux";
-                        compression = "none";
+                        compression = "${ramdisk_ctype}";
                         ${ramdisk_loadline}
                         ${ramdisk_entryline}
                         hash@1 {
@@ -341,8 +360,15 @@ fitimage_assemble() {
        # Step 4: Prepare a ramdisk section.
        #
        if [ "x${ramdiskcount}" = "x1" ] ; then
-               copy_initramfs
-               fitimage_emit_section_ramdisk ${1} "${ramdiskcount}" usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio
+               # Find and use the first initramfs image archive type we find
+               for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio; do
+                       initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${img}"
+                       echo "Using $initramfs_path"
+                       if [ -e "${initramfs_path}" ]; then
+                               fitimage_emit_section_ramdisk ${1} "${ramdiskcount}" "${initramfs_path}"
+                               break
+                       fi
+               done
        fi
 
        fitimage_emit_section_maint ${1} sectend