diff options
| author | David Mosberger <davidm@napali.hpl.hp.com> | 2003-07-09 20:39:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-09 20:39:43 -0700 |
| commit | e02f3ca365fc5f929631a2e80668f17dbd214a10 (patch) | |
| tree | 2f60efa4de3353fdc58ad77f763b55a14752f1b1 | |
| parent | e3a1c5ce7b6680a6dca043dc2e7b5b77d0d5e688 (diff) | |
[PATCH] Use ".incbin" for initramfs image build
This makes initramfs use ".incbin" to include a binary blob into the
object file, instead of using LDFLAGS_BLOB, which isn't supported on all
architectures.
This will require reasonably modern binutils, but is portable.
This is the last thing that keeps the standard tree from building
directly for ia64.
| -rw-r--r-- | usr/Makefile | 8 | ||||
| -rw-r--r-- | usr/initramfs_data.scr | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/usr/Makefile b/usr/Makefile index 58a915ee7fe5..295f32bdc51b 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -5,11 +5,9 @@ host-progs := gen_init_cpio clean-files := initramfs_data.cpio.gz -LDFLAGS_initramfs_data.o := $(LDFLAGS_BLOB) -r -T - -$(obj)/initramfs_data.o: $(src)/initramfs_data.scr \ - $(obj)/initramfs_data.cpio.gz FORCE - $(call if_changed,ld) +$(src)/initramfs_data.S: $(obj)/initramfs_data.cpio.gz + echo " .section .init.ramfs,\"a\"" > $(src)/initramfs_data.S + echo ".incbin \"usr/initramfs_data.cpio.gz\"" >> $(src)/initramfs_data.S # initramfs-y are the programs which will be copied into the CPIO # archive. Currently, the filenames are hardcoded in gen_init_cpio, diff --git a/usr/initramfs_data.scr b/usr/initramfs_data.scr deleted file mode 100644 index bf6d172329e0..000000000000 --- a/usr/initramfs_data.scr +++ /dev/null @@ -1,4 +0,0 @@ -SECTIONS -{ - .init.ramfs : { *(.data) } -} |