Patchwork [U-Boot,v4,11/13] smdk6400: Modify to work with generic relocation

login
register
mail settings
Submitter Simon Glass
Date Feb. 21, 2012, 1:32 a.m.
Message ID <1329787975-6695-12-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/142228/
State Deferred
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - Feb. 21, 2012, 1:32 a.m.
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 <sjg@chromium.org>
---
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(-)

Patch

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