summaryrefslogtreecommitdiff
path: root/usr/initramfs_data.S
diff options
context:
space:
mode:
authorHendrik Brueckner <brueckner@linux.vnet.ibm.com>2010-09-17 15:24:09 -0700
committerMichal Marek <mmarek@suse.cz>2010-09-29 16:28:59 +0200
commit6ae64e428f74e7bacab898ef9665dda719ea6fde (patch)
treefdd61e1757e43feddc91eeb32f5ac22e237b5012 /usr/initramfs_data.S
parentef894870c6c38580e540c29cfb22a827d54a950a (diff)
downloadlwn-6ae64e428f74e7bacab898ef9665dda719ea6fde.tar.gz
lwn-6ae64e428f74e7bacab898ef9665dda719ea6fde.zip
initramfs: generalize initramfs_data.xxx.S variants
Remove initramfs_data.{lzo,lzma,gz,bz2}.S variants and use a common implementation in initramfs_data.S. The common implementation expects the file name of the initramfs to be defined in INITRAMFS_IMAGE. Change the Makefile to set the INITRAMFS_IMAGE define symbol according to the selected compression method. Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Cc: WANG Cong <xiyou.wangcong@gmail.com> Acked-by: Michal Marek <mmarek@suse.cz> Acked-by: "H. Peter Anvin" <hpa@zytor.com> Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'usr/initramfs_data.S')
-rw-r--r--usr/initramfs_data.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S
index 7c6973d8d829..49a545fea120 100644
--- a/usr/initramfs_data.S
+++ b/usr/initramfs_data.S
@@ -25,6 +25,7 @@ SECTIONS
in the ELF header, as required by certain architectures.
*/
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio"
+#include <linux/stringify.h>
+.section .init.ramfs,"a"
+.incbin __stringify(INITRAMFS_IMAGE)