diff options
author | Albin Tonnerre <albin.tonnerre@free-electrons.com> | 2010-05-26 17:44:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:12:54 -0400 |
commit | 2a2a400f66e9e23eba960905c36dd37904bd9970 (patch) | |
tree | a46e11044410ddeb1d310fc4a1633f0438658327 /usr/Makefile | |
parent | edcd1d843adf09d1742d49ae04fa51bb63ddd1c3 (diff) |
initramfs: add support for in-kernel initramfs compressed with LZO
Add the necessary parts to be enable the use of LZO-compressed initramfs
build into the kernel.
Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Michal Marek <mmarek@suse.cz>
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/Makefile b/usr/Makefile index 1e6a9e4a72cc..6b4b6da0b67d 100644 --- a/usr/Makefile +++ b/usr/Makefile | |||
@@ -15,6 +15,9 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) = .bz2 | |||
15 | # Lzma | 15 | # Lzma |
16 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA) = .lzma | 16 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA) = .lzma |
17 | 17 | ||
18 | # Lzo | ||
19 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO) = .lzo | ||
20 | |||
18 | # Generate builtin.o based on initramfs_data.o | 21 | # Generate builtin.o based on initramfs_data.o |
19 | obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o | 22 | obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o |
20 | 23 | ||
@@ -45,7 +48,7 @@ endif | |||
45 | quiet_cmd_initfs = GEN $@ | 48 | quiet_cmd_initfs = GEN $@ |
46 | cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input) | 49 | cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input) |
47 | 50 | ||
48 | targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio | 51 | targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.lzo initramfs_data.cpio |
49 | # do not try to update files included in initramfs | 52 | # do not try to update files included in initramfs |
50 | $(deps_initramfs): ; | 53 | $(deps_initramfs): ; |
51 | 54 | ||