From: Daniel Schwierzeck Date: Thu, 3 Feb 2011 13:17:09 +0000 (+0100) Subject: MIPS: Purple: Fix multiple definition error on final linking of u-boot binary X-Git-Tag: v2011.03-rc2~60^2~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ec36d1f422f1a5b06d24db1ca8aedfacf0c8a30f;p=u-boot MIPS: Purple: Fix multiple definition error on final linking of u-boot binary 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 Cc: Wolfgang Denk Signed-off-by: Shinya Kuribayashi --- diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds index 542601af15..719f268f2c 100644 --- a/board/purple/u-boot.lds +++ b/board/purple/u-boot.lds @@ -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)