From: seedshope Date: Sat, 22 Jan 2011 10:06:11 +0000 (+0000) Subject: SMDK6400: Fix the mutiple link error X-Git-Tag: v2011.03-rc2~2^2~12 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb3527575dce5ced00bf3c2e92ce13a1fc491747;p=oweals%2Fu-boot.git SMDK6400: Fix the mutiple link error The first, the cpu_init.o have already been link for cmd_link_o_target atfer compile, But, The link script re-link the point file. So the link machine will generate multiple definition error information. The second, Since the first 4kB of nand boot featue code move to nand_spl, So It is not necessary to force the cpu_init.o in non-nand boot. Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index ef99dc9c29..21e1ed3b7a 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -35,7 +35,6 @@ SECTIONS .text : { arch/arm/cpu/arm1176/start.o (.text) - arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text) *(.text) }