diff options
| author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2010-09-17 15:24:09 -0700 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-09-29 16:28:59 +0200 |
| commit | 6ae64e428f74e7bacab898ef9665dda719ea6fde (patch) | |
| tree | fdd61e1757e43feddc91eeb32f5ac22e237b5012 /usr/initramfs_data.bz2.S | |
| parent | ef894870c6c38580e540c29cfb22a827d54a950a (diff) | |
| download | linux-3.10-6ae64e428f74e7bacab898ef9665dda719ea6fde.tar.gz linux-3.10-6ae64e428f74e7bacab898ef9665dda719ea6fde.tar.bz2 linux-3.10-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.bz2.S')
| -rw-r--r-- | usr/initramfs_data.bz2.S | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/usr/initramfs_data.bz2.S b/usr/initramfs_data.bz2.S deleted file mode 100644 index bc54d090365..00000000000 --- a/usr/initramfs_data.bz2.S +++ /dev/null @@ -1,29 +0,0 @@ -/* - initramfs_data includes the compressed binary that is the - filesystem used for early user space. - Note: Older versions of "as" (prior to binutils 2.11.90.0.23 - released on 2001-07-14) dit not support .incbin. - If you are forced to use older binutils than that then the - following trick can be applied to create the resulting binary: - - - ld -m elf_i386 --format binary --oformat elf32-i386 -r \ - -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o - ld -m elf_i386 -r -o built-in.o initramfs_data.o - - initramfs_data.scr looks like this: -SECTIONS -{ - .init.ramfs : { *(.data) } -} - - The above example is for i386 - the parameters vary from architectures. - Eventually look up LDFLAGS_BLOB in an older version of the - arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced. - - Using .incbin has the advantage over ld that the correct flags are set - in the ELF header, as required by certain architectures. -*/ - -.section .init.ramfs,"a" -.incbin "usr/initramfs_data.cpio.bz2" |