diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-04 16:02:37 +0100 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-15 16:26:21 +0100 |
| commit | 65e00e04e5aea34b256814cfa21b32e3b94a2402 (patch) | |
| tree | 59446df40381c120e9f06004b6bf700feddc1937 /usr/initramfs_data.S | |
| parent | gen_initramfs.sh: always output cpio even without -o option (diff) | |
| download | linux-65e00e04e5aea34b256814cfa21b32e3b94a2402.tar.xz linux-65e00e04e5aea34b256814cfa21b32e3b94a2402.zip | |
initramfs: refactor the initramfs build rules
Currently, usr/gen_initramfs.sh takes care of all the use-cases:
[1] generates a cpio file unless CONFIG_INITRAMFS_SOURCE points to
a single cpio archive
[2] If CONFIG_INITRAMFS_SOURCE is the path to a cpio archive,
use it as-is.
[3] Compress the cpio file according to CONFIG_INITRAMFS_COMPRESSION_*
unless it is passed a compressed archive.
To simplify the script, move [2] and [3] to usr/Makefile.
If CONFIG_INITRAMFS_SOURCE is the path to a cpio archive, there is
no need to run this shell script.
For the cpio archive compression, you can re-use the rules from
scripts/Makefile.lib .
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'usr/initramfs_data.S')
| -rw-r--r-- | usr/initramfs_data.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index d07648f05bbf..cd67edc38797 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -22,12 +22,9 @@ in the ELF header, as required by certain architectures. */ -#include <linux/stringify.h> -#include <asm-generic/vmlinux.lds.h> - .section .init.ramfs,"a" __irf_start: -.incbin __stringify(INITRAMFS_IMAGE) +.incbin "usr/initramfs_inc_data" __irf_end: .section .init.ramfs.info,"a" .globl __initramfs_size |