bzip2/lzma: fix built-in initramfs vs CONFIG_RD_GZIP
Impact: Resolves build failures in some configurations Makes it possible to disable CONFIG_RD_GZIP . In that case, the built-in initramfs will be compressed by whatever compressor is available (bzip2 or lzma) or left uncompressed if none is available. It also removes a couple of warnings which occur when no ramdisk compression at all is chosen. It also restores the select ZLIB_INFLATE in drivers/block/Kconfig which somehow came missing. This is needed to activate compilation of the stuff in zlib_deflate. Signed-off-by: Alain Knaff <alain@knaff.lu> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
committed by
H. Peter Anvin
parent
fb9a4ca982
commit
a26ee60f90
29
usr/initramfs_data.gz.S
Normal file
29
usr/initramfs_data.gz.S
Normal file
@@ -0,0 +1,29 @@
|
||||
/*
|
||||
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"
|
Reference in New Issue
Block a user