From patchwork Thu Jan 13 13:36:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: seedshope X-Patchwork-Id: 78755 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B6727B6EF1 for ; Fri, 14 Jan 2011 00:37:23 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 013CE280CF; Thu, 13 Jan 2011 14:37:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0ZnVFa6XMU6I; Thu, 13 Jan 2011 14:37:04 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A8765280DA; Thu, 13 Jan 2011 14:36:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BA559280C0 for ; Thu, 13 Jan 2011 14:36:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xr7S8BPGqnuU for ; Thu, 13 Jan 2011 14:36:48 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-iw0-f172.google.com (mail-iw0-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id F3D96280A4 for ; Thu, 13 Jan 2011 14:36:43 +0100 (CET) Received: by mail-iw0-f172.google.com with SMTP id 40so1549814iwn.3 for ; Thu, 13 Jan 2011 05:36:43 -0800 (PST) Received: by 10.231.171.197 with SMTP id i5mr2412509ibz.54.1294925803557; Thu, 13 Jan 2011 05:36:43 -0800 (PST) Received: from localhost.localdomain ([114.249.232.233]) by mx.google.com with ESMTPS id d21sm60484ibg.15.2011.01.13.05.36.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 13 Jan 2011 05:36:43 -0800 (PST) From: seedshope To: Albert ARIBAUD , Minkyu Kang , Sergei Shtylyov , u-boot@lists.denx.de Date: Thu, 13 Jan 2011 21:36:23 +0800 Message-Id: <1294925784-5042-4-git-send-email-bocui107@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294925784-5042-1-git-send-email-bocui107@gmail.com> References: <1294925784-5042-1-git-send-email-bocui107@gmail.com> Subject: [U-Boot] [v3 patch 3/4] SMDK6400: Fix build error for nand_spl support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Add some relocation symbols to u-boot.lds and disable LED functions in start.s to support nand_spl. Signed-off-by: seedshope diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 237dcfe..ae3706a 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -354,9 +354,11 @@ clbss_l:str r2, [r0] /* clear loop... */ cmp r0, r1 bne clbss_l +#ifndef CONFIG_NAND_SPL bl coloured_LED_init bl red_LED_on #endif +#endif /* * We are done. Do not return, instead branch to second part of board diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds b/nand_spl/board/samsung/smdk6400/u-boot.lds index 3ac6aa1..30b1573 100644 --- a/nand_spl/board/samsung/smdk6400/u-boot.lds +++ b/nand_spl/board/samsung/smdk6400/u-boot.lds @@ -55,7 +55,22 @@ SECTIONS __u_boot_cmd_end = .; . = ALIGN(4); + + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; - .bss : { *(.bss) . = ALIGN(4); } + *(.bss) + . = ALIGN(4); _end = .; + } }