From patchwork Tue Feb 21 01:32:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 142228 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 9A8CCB6EF1 for ; Tue, 21 Feb 2012 12:35:20 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A0F8280C4; Tue, 21 Feb 2012 02:34:49 +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 E6jeBcmqsPlK; Tue, 21 Feb 2012 02:34:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6794528102; Tue, 21 Feb 2012 02:33:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A5A41280CE for ; Tue, 21 Feb 2012 02:33:21 +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 AuxkbDawbMry for ; Tue, 21 Feb 2012 02:33:21 +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-gx0-f202.google.com (mail-gx0-f202.google.com [209.85.161.202]) by theia.denx.de (Postfix) with ESMTPS id 4EAA9280BE for ; Tue, 21 Feb 2012 02:33:14 +0100 (CET) Received: by ggnp1 with SMTP id p1so753281ggn.3 for ; Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received-SPF: pass (google.com: domain of sjg@google.com designates 10.101.5.39 as permitted sender) client-ip=10.101.5.39; Authentication-Results: mr.google.com; spf=pass (google.com: domain of sjg@google.com designates 10.101.5.39 as permitted sender) smtp.mail=sjg@google.com Received: from mr.google.com ([10.101.5.39]) by 10.101.5.39 with SMTP id h39mr11339099ani.5.1329787993644 (num_hops = 1); Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: by 10.101.5.39 with SMTP id h39mr8066780ani.5.1329787993567; Mon, 20 Feb 2012 17:33:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.101.5.39 with SMTP id h39mr8066749ani.5.1329787993391; Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id z63si11997847yhg.5.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 wpzn3.hot.corp.google.com (Postfix) with ESMTP id 49DED10004D; Mon, 20 Feb 2012 17:33:13 -0800 (PST) Received: by sglass.mtv.corp.google.com (Postfix, from userid 121222) id 2BEFE140604; Mon, 20 Feb 2012 17:33:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Mon, 20 Feb 2012 17:32:53 -0800 Message-Id: <1329787975-6695-12-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: ALoCoQl7sm7PJ/ehQ7PCtHIVYl/wT1ZWtTgPFuNw/FvnAeRu7+bBtyw6CGiiZkVZpvzRXHdjwdoLTWjqBmCUEo/iYF/ocdXJc28cm7gg5kTYCB1yrAscKOV9r817rgSM+RmtlAE91LppIlROAQVA4XWgOdoB1PJuiu1x7mYaL87zMkkFaiT9L2s= Cc: Chander Kashyap , Tom Rini Subject: [U-Boot] [PATCH v4 11/13] smdk6400: 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 This seems to use an old SPL framework, or at least it is ugly enough that I hope it is old. Add symlinks for the new files required by generic relocation. Signed-off-by: Simon Glass --- Changes in v4: - Add new patch to fix smdk6400 with generic relocation nand_spl/board/samsung/smdk6400/Makefile | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile index c9e75ba..c79e12b 100644 --- a/nand_spl/board/samsung/smdk6400/Makefile +++ b/nand_spl/board/samsung/smdk6400/Makefile @@ -39,6 +39,9 @@ CFLAGS += -DCONFIG_NAND_SPL -ffunction-sections SOBJS = start.o cpu_init.o lowlevel_init.o COBJS = nand_boot.o nand_ecc.o s3c64xx.o smdk6400_nand_spl.o nand_base.o +ifndef CONFIG_SYS_SKIP_RELOC +COBJS += reloc.o membasic.o +endif SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) @@ -101,6 +104,14 @@ $(obj)smdk6400_nand_spl.c: $(obj)nand_base.c: @rm -f $@ @ln -s $(TOPDIR)/drivers/mtd/nand/nand_base.c $@ + +$(obj)reloc.c: + @rm -f $@ + @ln -s $(TOPDIR)/common/reloc.c $@ + +$(obj)membasic.c: + @rm -f $@ + @ln -s $(TOPDIR)/lib/membasic.c $@ ######################################################################### $(obj)%.o: $(obj)%.S