Messages in this thread Patch in this message | | | Date | Thu, 21 Aug 2003 00:44:42 -0400 | From | Brian Gerst <> | Subject | [PATCH] Use .incbin for piggy.o |
| |
Simplify creation of piggy.o (i386 arch) using .incbin instead of an ld script.
Several other arches use the same method, and should be changed accordingly by the respective maintainers.
-- Brian Gerst diff -urN linux-2.6.0-test3-bk/arch/i386/boot/compressed/Makefile linux/arch/i386/boot/compressed/Makefile --- linux-2.6.0-test3-bk/arch/i386/boot/compressed/Makefile 2003-07-27 13:06:05.000000000 -0400 +++ linux/arch/i386/boot/compressed/Makefile 2003-08-19 10:31:35.201669976 -0400 @@ -19,7 +19,4 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE $(call if_changed,gzip) -LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T - -$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE - $(call if_changed,ld) +$(obj)/piggy.o: $(obj)/vmlinux.bin.gz FORCE diff -urN linux-2.6.0-test3-bk/arch/i386/boot/compressed/piggy.S linux/arch/i386/boot/compressed/piggy.S --- linux-2.6.0-test3-bk/arch/i386/boot/compressed/piggy.S 1969-12-31 19:00:00.000000000 -0500 +++ linux/arch/i386/boot/compressed/piggy.S 2003-08-19 10:31:58.172177928 -0400 @@ -0,0 +1,7 @@ +.data +.globl input_len, input_data, input_data_end +input_len: + .long input_data_end - input_data; +input_data: + .incbin "arch/i386/boot/compressed/vmlinux.bin.gz" +input_data_end: diff -urN linux-2.6.0-test3-bk/arch/i386/boot/compressed/vmlinux.scr linux/arch/i386/boot/compressed/vmlinux.scr --- linux-2.6.0-test3-bk/arch/i386/boot/compressed/vmlinux.scr 2003-07-27 13:09:42.000000000 -0400 +++ linux/arch/i386/boot/compressed/vmlinux.scr 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -SECTIONS -{ - .data : { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) - input_data_end = .; - } -} | |