Patchwork [U-Boot,v4,08/13] tx25: 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-9-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/142218/
State Deferred
Delegated to: Tom Rini
Headers show

Comments

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

Patch

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 = .;