From patchwork Sat Jan 22 20:06:11 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,v5,3/6] SMDK6400: Fix the mutiple link error
From: seedshope <bocui107@gmail.com>
X-Patchwork-Id: 80016
Message-Id: <1295726774-5899-4-git-send-email-bocui107@gmail.com>
To: Sergei Shtylyov <sshtylyov@mvista.com>,
 Albert ARIBAUD <albert.aribaud@free.fr>,
 Minkyu Kang <promsoft@gmail.com>, u-boot@lists.denx.de
Date: Sun, 23 Jan 2011 04:06:11 +0800

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 <bocui107@gmail.com>


diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds
index 6771981..6bf4971 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)
 	}