ARMV7: OMAP4: Implement relocation for Panda and OMAP4430SDP

This patch fixes the build breakage introduced by the recent relocation
changes for ARMV7

Signed-off-by: Steve Sakoman <steve@sakoman.com>

arch/arm/cpu/armv7/omap4/board.c

@@ -102,8 +102,13 @@ int dram_init(void)
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 	gd->bd->bi_dram[0].start = 0x80000000;
 	gd->bd->bi_dram[0].size = sdram_size();
+#else
+	gd->ram_size = sdram_size();
+#endif
+
 	return 0;
 }
 

board/ti/panda/config.mk

@@ -27,6 +27,4 @@
 # 8000'0000 - 9fff'ffff (512 MB)
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
-
-# Let's place u-boot 1MB before the end of SDRAM.
-TEXT_BASE = 0x9ff00000
+TEXT_BASE = 0x80e80000

board/ti/sdp4430/config.mk

@@ -28,5 +28,4 @@
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 
-# Let's place u-boot 1MB before the end of SDRAM.
-TEXT_BASE = 0x9ff00000
+TEXT_BASE = 0x80e80000

include/configs/omap4_panda.h

@@ -138,12 +138,6 @@
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
 #undef CONFIG_CMD_IMLS		/* List all found images        */
 
-/*
- * Enabling relocation of u-boot by default
- * Relocation can be skipped if u-boot is copied to the TEXT_BASE
- */
-#undef CONFIG_SKIP_RELOCATE_UBOOT
-
 /*
  * Environment setup
  */
@@ -233,4 +227,7 @@
  */
 #define CONFIG_NR_DRAM_BANKS	1
 
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
+#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE)
+
 #endif /* __CONFIG_H */

include/configs/omap4_sdp4430.h

@@ -143,12 +143,6 @@
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
 #undef CONFIG_CMD_IMLS		/* List all found images        */
 
-/*
- * Enabling relocation of u-boot by default
- * Relocation can be skipped if u-boot is copied to the TEXT_BASE
- */
-#undef CONFIG_SKIP_RELOCATE_UBOOT
-
 /*
  * Environment setup
  */
@@ -238,4 +232,7 @@
  */
 #define CONFIG_NR_DRAM_BANKS	1
 
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
+#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE)
+
 #endif /* __CONFIG_H */