diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-09 11:25:08 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-09 11:25:08 -0400 |
commit | 7b022d07a0fd2ce02d4456b732c674ff1d16f5ce (patch) | |
tree | 02bd8fccea476085e5184f413d4210695f83c88b /arch/sh/boot | |
parent | dce97c8cb2ad365fa87dc6924d99528c21c63912 (diff) |
sh: Tidy up the ldscript output format specifier.
Tie this in to the Makefile directly, where we already know what we are
running on. This tidies up the linker script a bit, and is prep work for
unifying the arch/sh/boot/compressed linker scripts.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boot')
-rw-r--r-- | arch/sh/boot/compressed/Makefile_32 | 3 | ||||
-rw-r--r-- | arch/sh/boot/compressed/Makefile_64 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/boot/compressed/Makefile_32 b/arch/sh/boot/compressed/Makefile_32 index b96a055b053e..249255729d7c 100644 --- a/arch/sh/boot/compressed/Makefile_32 +++ b/arch/sh/boot/compressed/Makefile_32 | |||
@@ -28,7 +28,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) | |||
28 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) | 28 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) |
29 | endif | 29 | endif |
30 | 30 | ||
31 | LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds | 31 | LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \ |
32 | -T $(obj)/../../kernel/vmlinux.lds | ||
32 | 33 | ||
33 | $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE | 34 | $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE |
34 | $(call if_changed,ld) | 35 | $(call if_changed,ld) |
diff --git a/arch/sh/boot/compressed/Makefile_64 b/arch/sh/boot/compressed/Makefile_64 index 658d4f915556..541a529d066c 100644 --- a/arch/sh/boot/compressed/Makefile_64 +++ b/arch/sh/boot/compressed/Makefile_64 | |||
@@ -24,8 +24,8 @@ OBJECTS := $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \ | |||
24 | ZIMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ | 24 | ZIMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ |
25 | $$[$(CONFIG_PAGE_OFFSET)+0x400000+0x10000]') | 25 | $$[$(CONFIG_PAGE_OFFSET)+0x400000+0x10000]') |
26 | 26 | ||
27 | LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \ | 27 | LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(ZIMAGE_OFFSET) -e startup \ |
28 | -T $(obj)/../../kernel/vmlinux.lds | 28 | -T $(obj)/../../kernel/vmlinux.lds |
29 | 29 | ||
30 | $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE | 30 | $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE |
31 | $(call if_changed,ld) | 31 | $(call if_changed,ld) |