2 files changed, 22 insertions, 1 deletions

diff --git a/usr/Kconfig b/usr/Kconfig
index c2c7fe2f717d..4780deac5974 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -72,6 +72,15 @@ config RD_LZMA
           Support loading of a LZMA encoded initial ramdisk or cpio buffer
           If unsure, say N.
 
+config RD_XZ
+        bool "Support initial ramdisks compressed using XZ" if EMBEDDED
+        default !EMBEDDED
+        depends on BLK_DEV_INITRD
+        select DECOMPRESS_XZ
+        help
+          Support loading of a XZ encoded initial ramdisk or cpio buffer.
+          If unsure, say N.
+
 config RD_LZO
         bool "Support initial ramdisks compressed using LZO" if EMBEDDED
         default !EMBEDDED
@@ -139,6 +148,15 @@ config INITRAMFS_COMPRESSION_LZMA
           three. Compression is slowest. The initramfs size is about 33%
           smaller with LZMA in comparison to gzip.
 
+config INITRAMFS_COMPRESSION_XZ
+        bool "XZ"
+        depends on RD_XZ
+        help
+          XZ uses the LZMA2 algorithm. The initramfs size is about 30%
+          smaller with XZ in comparison to gzip. Decompression speed
+          is better than that of bzip2 but worse than gzip and LZO.
+          Compression is slow.
+
 config INITRAMFS_COMPRESSION_LZO
         bool "LZO"
         depends on RD_LZO
diff --git a/usr/Makefile b/usr/Makefile
index 6faa444b7087..029ffe6cd0d8 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -15,6 +15,9 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2)  = .bz2
 # Lzma
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA)   = .lzma
 
+# XZ
+suffix_$(CONFIG_INITRAMFS_COMPRESSION_XZ)     = .xz
+
 # Lzo
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO)   = .lzo
 
@@ -50,7 +53,7 @@ endif
 quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
-targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.lzo initramfs_data.cpio
+targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio
 # do not try to update files included in initramfs
 $(deps_initramfs): ;