Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 26 insertions, 8 deletions

diff --git a/usr/Kconfig b/usr/Kconfig
index e2721f5a3504..65b845bd4e3e 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -46,7 +46,7 @@ config INITRAMFS_ROOT_GID
           If you are not sure, leave it set to "0".
 
 config RD_GZIP
-        bool "Support initial ramdisks compressed using gzip" if EMBEDDED
+        bool "Support initial ramdisks compressed using gzip" if EXPERT
         default y
         depends on BLK_DEV_INITRD
         select DECOMPRESS_GZIP
@@ -55,8 +55,8 @@ config RD_GZIP
           If unsure, say Y.
 
 config RD_BZIP2
-        bool "Support initial ramdisks compressed using bzip2" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using bzip2" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_BZIP2
         help
@@ -64,17 +64,26 @@ config RD_BZIP2
           If unsure, say N.
 
 config RD_LZMA
-        bool "Support initial ramdisks compressed using LZMA" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using LZMA" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_LZMA
         help
           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 EXPERT
+        default !EXPERT
+        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
+        bool "Support initial ramdisks compressed using LZO" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_LZO
         help
@@ -139,12 +148,21 @@ 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
         help
           Its compression ratio is the poorest among the four. The kernel
-          size is about about 10% bigger than gzip; however its speed
+          size is about 10% bigger than gzip; however its speed
           (both compression and decompression) is the fastest.
 
 endchoice