]> git.sur5r.net Git - u-boot/commitdiff
MIPS: Purple: Fix multiple definition error on final linking of u-boot binary
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Thu, 3 Feb 2011 13:17:09 +0000 (14:17 +0100)
committerShinya Kuribayashi <skuribay@pobox.com>
Sat, 5 Feb 2011 11:05:14 +0000 (20:05 +0900)
The linker of recent toolchains complains about multiple definitions
on final linking of u-boot binary. This patch removes all redundant
object files from u-boot.lds those are already added to .text section
by the linker.

That patch could not be tested but the resulting u-boot.map still looks
good. The start symbol is at 0xB0000000, the environment at 0xB0008000
so u-boot should boot.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Wolfgang Denk <wd@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
board/purple/u-boot.lds

index 542601af15ab8f3d7236635d3d6e2f5d74f71a1d..719f268f2c7b7065644b2b793d9b3cbc21bcfbf7 100644 (file)
@@ -36,11 +36,6 @@ SECTIONS
        {
          arch/mips/cpu/start.o         (.text)
          board/purple/lowlevel_init.o  (.text)
-         arch/mips/cpu/cache.o         (.text)
-         common/main.o                 (.text)
-         common/dlmalloc.o             (.text)
-         common/cmd_boot.o             (.text)
-         lib/zlib.o            (.text)
          . = DEFINED(env_offset) ? env_offset : .;
          common/env_embedded.o (.ppcenv)