diff options
| author | Francisco Blas Izquierdo Riera (klondike) <klondike@klondike.es> | 2016-12-14 15:06:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 16:04:08 -0800 |
| commit | 35e669e1a254e8b60d4a8983205b383666cc01ca (patch) | |
| tree | e08553ab2cf9e0f19e44eff03f8cae1e77604bb9 /usr/Makefile | |
| parent | 34aaff40b42148b23dcde40152480e25c7d2d759 (diff) | |
| download | linux-stable-35e669e1a254e8b60d4a8983205b383666cc01ca.tar.gz linux-stable-35e669e1a254e8b60d4a8983205b383666cc01ca.tar.bz2 linux-stable-35e669e1a254e8b60d4a8983205b383666cc01ca.zip | |
initramfs: select builtin initram compression algorithm on KConfig instead of Makefile
Move the current builtin initram compression algorithm selection from
the Makefile into the INITRAMFS_COMPRESSION variable. This makes
deciding algorithm precedence easier and would allow for overrides if
new algorithms want to be tested.
Link: http://lkml.kernel.org/r/57EAD769.1090401@klondike.es
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@klondike.es>
Cc: P J P <ppandit@redhat.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/usr/Makefile b/usr/Makefile index e767f019accf..17a513268325 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -5,25 +5,7 @@ klibcdirs:; PHONY += klibcdirs - -# Bzip2 -suffix_$(CONFIG_RD_BZIP2) = .bz2 - -# Lzma -suffix_$(CONFIG_RD_LZMA) = .lzma - -# XZ -suffix_$(CONFIG_RD_XZ) = .xz - -# Lzo -suffix_$(CONFIG_RD_LZO) = .lzo - -# Lz4 -suffix_$(CONFIG_RD_LZ4) = .lz4 - -# Gzip -suffix_$(CONFIG_RD_GZIP) = .gz - +suffix_y = $(CONFIG_INITRAMFS_COMPRESSION) AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)" # Generate builtin.o based on initramfs_data.o |