diff options
| author | Ian Campbell <ijc@hellion.org.uk> | 2008-01-30 13:33:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:38 +0100 |
| commit | f18c0e792057059eab9a8ce929af424ff8a4a90f (patch) | |
| tree | b419a2757ad5cab0b452651fb130bb3b1c18acdc /arch/x86/boot | |
| parent | 20514e9f6e6221884afada04fbbbde651d3d8654 (diff) | |
| download | linux-f18c0e792057059eab9a8ce929af424ff8a4a90f.tar.bz2 | |
x86: unify arch/x86/boot/compressed/vmlinux_??.scr
The files are now identical so merge them.
size reports no change in arch/x86/boot/compressed/vmlinux.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux.scr (renamed from arch/x86/boot/compressed/vmlinux_32.scr) | 0 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_64.scr | 10 |
3 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index d6ae347d11f1..baffeafa798f 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -59,5 +59,5 @@ LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T endif -$(obj)/piggy.o: $(obj)/vmlinux_$(BITS).scr $(obj)/vmlinux.bin.gz FORCE +$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE $(call if_changed,ld) diff --git a/arch/x86/boot/compressed/vmlinux_32.scr b/arch/x86/boot/compressed/vmlinux.scr index f02382ae5c48..f02382ae5c48 100644 --- a/arch/x86/boot/compressed/vmlinux_32.scr +++ b/arch/x86/boot/compressed/vmlinux.scr diff --git a/arch/x86/boot/compressed/vmlinux_64.scr b/arch/x86/boot/compressed/vmlinux_64.scr deleted file mode 100644 index f02382ae5c48..000000000000 --- a/arch/x86/boot/compressed/vmlinux_64.scr +++ /dev/null @@ -1,10 +0,0 @@ -SECTIONS -{ - .rodata.compressed : { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) - output_len = . - 4; - input_data_end = .; - } -} |