浏览代码

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>
Ian Campbell 17 年之前
父节点
当前提交
f18c0e7920
共有 3 个文件被更改,包括 1 次插入11 次删除
  1. 1 1
      arch/x86/boot/compressed/Makefile
  2. 0 0
      arch/x86/boot/compressed/vmlinux.scr
  3. 0 10
      arch/x86/boot/compressed/vmlinux_64.scr

+ 1 - 1
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)

+ 0 - 0
arch/x86/boot/compressed/vmlinux_32.scr → arch/x86/boot/compressed/vmlinux.scr


+ 0 - 10
arch/x86/boot/compressed/vmlinux_64.scr

@@ -1,10 +0,0 @@
-SECTIONS
-{
-  .rodata.compressed : {
-	input_len = .;
-	LONG(input_data_end - input_data) input_data = .;
-	*(.data)
-	output_len = . - 4;
-	input_data_end = .;
-	}
-}