Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae64e42 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Michal Marek
Browse files

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: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: default avatarMichal Marek <mmarek@suse.cz>
Acked-by: default avatar"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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent ef894870

usr/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -18,13 +18,15 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA) = .lzma 
# Lzo

suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO)   = .lzo



AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"



# Generate builtin.o based on initramfs_data.o

obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o

obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o



# initramfs_data.o contains the compressed initramfs_data.cpio image.

# The image is included using .incbin, a dependency which is not

# tracked automatically.

$(obj)/initramfs_data$(suffix_y).o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE

$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE



#####

# Generate the initramfs cpio archive

usr/initramfs_data.S

+3 −2
Original line number Diff line number Diff line
@@ -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)

usr/initramfs_data.bz2.S

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

  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"

usr/initramfs_data.gz.S

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

  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.gz"

usr/initramfs_data.lzma.S

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

  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.lzma"