diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:13:43 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:13:43 -0400 |
commit | 16ae1544b763b33673f82d667b0f7699dd1274b9 (patch) | |
tree | c9b44146acbe5bb25a5bfc6cae09c5229257a73b /arch/i386 | |
parent | 20e482b6421cffa92942e2c4970c113667451205 (diff) |
i386: prepare shared boot/compressed/head.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/boot/compressed/Makefile | 4 | ||||
-rw-r--r-- | arch/i386/boot/compressed/head_32.S (renamed from arch/i386/boot/compressed/head.S) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile index 3f4289143e39..0c64c314eadb 100644 --- a/arch/i386/boot/compressed/Makefile +++ b/arch/i386/boot/compressed/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | # create a compressed vmlinux image from the original vmlinux | 4 | # create a compressed vmlinux image from the original vmlinux |
5 | # | 5 | # |
6 | 6 | ||
7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc_32.o piggy.o \ | 7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \ |
8 | vmlinux.bin.all vmlinux.relocs | 8 | vmlinux.bin.all vmlinux.relocs |
9 | EXTRA_AFLAGS := -traditional | 9 | EXTRA_AFLAGS := -traditional |
10 | 10 | ||
@@ -17,7 +17,7 @@ CFLAGS := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ | |||
17 | $(call cc-option,-fno-stack-protector) | 17 | $(call cc-option,-fno-stack-protector) |
18 | LDFLAGS := -m elf_i386 | 18 | LDFLAGS := -m elf_i386 |
19 | 19 | ||
20 | $(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head.o $(obj)/misc_32.o $(obj)/piggy.o FORCE | 20 | $(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE |
21 | $(call if_changed,ld) | 21 | $(call if_changed,ld) |
22 | @: | 22 | @: |
23 | 23 | ||
diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head_32.S index f35ea2237522..f35ea2237522 100644 --- a/arch/i386/boot/compressed/head.S +++ b/arch/i386/boot/compressed/head_32.S | |||