diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-17 05:56:38 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-17 05:56:38 +0000 |
commit | 1b316bbe0f37be0a3c8f5d39e2afc7c4ec2bcfe9 (patch) | |
tree | f63c7e6eb8809f488659bcfad3f6993b50fcbaef /arch/mips/Makefile | |
parent | d60b0354c6cc4d90a04a6434ebac6c68b6a34d5b (diff) |
Poking at the linker scripts for the CP7000, today's mail exchange
and the great job people do at maintaining their own linkscripts made
clear we really want exactly one linker script and no more for all the
kernels.
Diffstat (limited to 'arch/mips/Makefile')
-rw-r--r-- | arch/mips/Makefile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 3ea928267..bf6c7fd36 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -102,7 +102,7 @@ AFLAGS += $(GCCFLAGS) ifdef CONFIG_ALGOR_P4032 CORE_FILES += arch/mips/algor/algor.o SUBDIRS += arch/mips/algor -#LOADADDR += 0x80000000 +LOADADDR += 0x80000000 endif # @@ -196,7 +196,7 @@ endif ifdef CONFIG_MIPS_EV64120 LIBS += arch/mips/galileo-boards/ev64120/ev64120.o SUBDIRS += arch/mips/galileo-boards/ev64120 -LINKSCRIPT = arch/mips/galileo-boards/ev64120/ld.script.galileo +LOADADDR += 0x80100000 endif # @@ -223,18 +223,12 @@ endif # error messages during linking. Select a default linkscript if # none has been choosen above. # -ifndef LINKSCRIPT vmlinux: arch/$(ARCH)/ld.script -arch/$(ARCH)/ld.script: arch/$(ARCH)/ld.script.in - sed 's/@@OUTPUT_FORMAT@@/$(output-format)/' <$< >$@ -LINKSCRIPT = arch/mips/ld.script -endif -LINKFLAGS += -T $(word 1,$(LINKSCRIPT)) - -ifdef LOADADDR -LINKFLAGS += -Ttext $(word 1,$(LOADADDR)) -endif +arch/$(ARCH)/ld.script: arch/$(ARCH)/ld.script.in arch/$(ARCH)/Makefile + sed -e 's/@@OUTPUT_FORMAT@@/$(output-format)/' \ + -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@ +LINKFLAGS += -T arch/$(ARCH)/ld.script HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o |