From patchwork Tue Feb 21 01:32:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 142218 X-Patchwork-Delegate: trini@ti.com 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 852BFB6EEE for ; Tue, 21 Feb 2012 12:33:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71AC1280C3; Tue, 21 Feb 2012 02:33:42 +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 oxYbQVoxXYdS; Tue, 21 Feb 2012 02:33:42 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AAEC1280CF; Tue, 21 Feb 2012 02:33:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 425A6280A5 for ; Tue, 21 Feb 2012 02:33:18 +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 90HxbRCg8aOK for ; Tue, 21 Feb 2012 02:33:17 +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-ee0-f74.google.com (mail-ee0-f74.google.com [74.125.83.74]) by theia.denx.de (Postfix) with ESMTPS id 67893280C3 for ; Tue, 21 Feb 2012 02:33:13 +0100 (CET) Received: by eekb15 with SMTP id b15so223077eek.3 for ; Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received-SPF: pass (google.com: domain of sjg@google.com designates 10.14.27.138 as permitted sender) client-ip=10.14.27.138; Authentication-Results: mr.google.com; spf=pass (google.com: domain of sjg@google.com designates 10.14.27.138 as permitted sender) smtp.mail=sjg@google.com Received: from mr.google.com ([10.14.27.138]) by 10.14.27.138 with SMTP id e10mr6991763eea.1.1329787993633 (num_hops = 1); Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: by 10.14.27.138 with SMTP id e10mr5904024eea.1.1329787993612; Mon, 20 Feb 2012 17:33:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.14.27.138 with SMTP id e10mr5903984eea.1.1329787993409; Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id p49si16415828eef.0.2012.02.20.17.33.13 (version=TLSv1/SSLv3 cipher=AES128-SHA); Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: from sglass.mtv.corp.google.com (sglass.mtv.corp.google.com [172.22.72.144]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id 38EAB20004E; Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: by sglass.mtv.corp.google.com (Postfix, from userid 121222) id A22F6140823; Mon, 20 Feb 2012 17:33:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Mon, 20 Feb 2012 17:32:50 -0800 Message-Id: <1329787975-6695-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1329787975-6695-1-git-send-email-sjg@chromium.org> References: <1329787975-6695-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQl4z1PuDENAdWU14bRB0TlOGl4DUhM5AOevC/gPw2Owk2rdp0RWFGoD/GHK4hBWPJqEKbFzMFhpmOsasgYp6+MndPpmh3XQXwcL9H6cdCyAYuT/fjsUeoB3X94iVYwdp7VWoTXBwxmDJ7GtpMa6OnBmBdR2zM9DJsV+fQs9aGrCx584iGM= Cc: Tom Rini , John Rigby Subject: [U-Boot] [PATCH v4 08/13] tx25: Modify to work with generic relocation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Add use of common/ and lib/ libraries for the SPL stage, and add the new link symbol required for generic relocation. Signed-off-by: Simon Glass --- Changes in v4: - Split out tx25 changes into new patch include/configs/tx25.h | 2 ++ nand_spl/board/karo/tx25/Makefile | 11 ++++++++++- nand_spl/board/karo/tx25/u-boot.lds | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 87bd8a6..115d810 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -58,6 +58,8 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif +#define CONFIG_SPL_LIBGENERIC_SUPPORT + #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile index 0336346..c253d42 100644 --- a/nand_spl/board/karo/tx25/Makefile +++ b/nand_spl/board/karo/tx25/Makefile @@ -33,7 +33,10 @@ AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL SOBJS = start.o lowlevel_init.o -COBJS = nand_boot_fsl_nfc.o +COBJS = nand_boot_fsl_nfc.o membasic.o +ifndef CONFIG_SYS_SKIP_RELOC +COBJS += reloc.o +endif SRCS := $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c SRCS += $(SRCTREE)/arch/arm/cpu/arm926ejs/start.S @@ -71,6 +74,12 @@ $(obj)%.o: $(SRCTREE)/board/karo/tx25/%.S $(obj)%.o: $(SRCTREE)/nand_spl/%.c $(CC) $(CFLAGS) -c -o $@ $< +$(obj)%.o: $(SRCTREE)/common/%.c + $(CC) $(CFLAGS) -c -o $@ $< + +$(obj)%.o: $(SRCTREE)/lib/%.c + $(CC) $(CFLAGS) -c -o $@ $< + # defines $(obj).depend target include $(SRCTREE)/rules.mk diff --git a/nand_spl/board/karo/tx25/u-boot.lds b/nand_spl/board/karo/tx25/u-boot.lds index d2b08f6..2273e9b 100644 --- a/nand_spl/board/karo/tx25/u-boot.lds +++ b/nand_spl/board/karo/tx25/u-boot.lds @@ -51,6 +51,7 @@ SECTIONS __u_boot_cmd_end = .; . = ALIGN(4); + __image_copy_end = .; .rel.dyn : { __rel_dyn_start = .;