diff --git a/[refs] b/[refs] index a3c30f4aa966..f928fa46f812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20514e9f6e6221884afada04fbbbde651d3d8654 +refs/heads/master: f18c0e792057059eab9a8ce929af424ff8a4a90f diff --git a/trunk/arch/x86/boot/compressed/Makefile b/trunk/arch/x86/boot/compressed/Makefile index d6ae347d11f1..baffeafa798f 100644 --- a/trunk/arch/x86/boot/compressed/Makefile +++ b/trunk/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/trunk/arch/x86/boot/compressed/vmlinux_32.scr b/trunk/arch/x86/boot/compressed/vmlinux.scr similarity index 100% rename from trunk/arch/x86/boot/compressed/vmlinux_32.scr rename to trunk/arch/x86/boot/compressed/vmlinux.scr diff --git a/trunk/arch/x86/boot/compressed/vmlinux_64.scr b/trunk/arch/x86/boot/compressed/vmlinux_64.scr deleted file mode 100644 index f02382ae5c48..000000000000 --- a/trunk/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 = .; - } -}