diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:13:43 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:13:43 +0200 |
| commit | 16ae1544b763b33673f82d667b0f7699dd1274b9 (patch) | |
| tree | c9b44146acbe5bb25a5bfc6cae09c5229257a73b /arch/i386/boot | |
| 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/boot')
| -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 @@ # create a compressed vmlinux image from the original vmlinux # -targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc_32.o piggy.o \ +targets := vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \ vmlinux.bin.all vmlinux.relocs EXTRA_AFLAGS := -traditional @@ -17,7 +17,7 @@ CFLAGS := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ $(call cc-option,-fno-stack-protector) LDFLAGS := -m elf_i386 -$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head.o $(obj)/misc_32.o $(obj)/piggy.o FORCE +$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE $(call if_changed,ld) @: 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 |