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>

diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 8c1f3953edd49153e6048f123d8e65db0310b9ab..24a66f5b94637e8d00e81b0ac601c6db74b06be0 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/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;
 }
 

diff --git a/board/ti/panda/config.mk b/board/ti/panda/config.mk
index 73822637655f3ec4fa7cf68b61e425fd5de5f798..7176c14fcc185a719a8ecb3d02f61d729a378b98 100644 (file)
--- a/board/ti/panda/config.mk
+++ b/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

diff --git a/board/ti/sdp4430/config.mk b/board/ti/sdp4430/config.mk
index 73822637655f3ec4fa7cf68b61e425fd5de5f798..7bb94734990d6b5ebd4e76d7462bd5cfca440d79 100644 (file)
--- a/board/ti/sdp4430/config.mk
+++ b/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

diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 2618f7df7cd10e3b11b4a49d72cbd498a490e4f4..b52ca19ae9ad6ee866900c093194d87406416181 100644 (file)
--- a/include/configs/omap4_panda.h
+++ b/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 */

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index 8274577ac8f47e19909183dca8bc6ab269488551..174d73f0668b353d1019460d48b38bbdf8a60923 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/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 */