diff mbox

[U-Boot,v4] da830: fixup ARM relocation support

Message ID 4CE10ECA.6050302@ge.com
State Accepted
Commit f35d61ac3d1fd324a171904f3fa114e3b10e24ef
Delegated to: Sandeep Paulraj
Headers show

Commit Message

Nick Thompson Nov. 15, 2010, 10:43 a.m. UTC 
Fixes build breakage in da830evm after commit
97003756249bd790910417eb66f0039bbf06a02c "da8xx: fixup ARM
relocation support"

The da8xx fixup commit changed da830/da850 common code to make
relocation work in da850, but didn't add the required defines
to da830evm_config.h resulting in build failure in the common code.

This patch adds those defines for da830, but makes no sense without
also referring to the commit mentioned above.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Reviewed-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
Changes since v1:
removed CONFIG_SKIP_RELOCATE_UBOOT

Changes since v2:
removed "#undef CONFIG_SYS_ARM_WITHOUT_RELOC" as it is not defined
in the first place.

Changes since v3:
Rebased to lastest

 include/configs/da830evm.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Comments

Sandeep Paulraj Nov. 19, 2010, 4:15 p.m. UTC | #1 
> 
> Fixes build breakage in da830evm after commit
> 97003756249bd790910417eb66f0039bbf06a02c "da8xx: fixup ARM
> relocation support"
> 
> The da8xx fixup commit changed da830/da850 common code to make
> relocation work in da850, but didn't add the required defines
> to da830evm_config.h resulting in build failure in the common code.
> 
> This patch adds those defines for da830, but makes no sense without
> also referring to the commit mentioned above.
> 
> Signed-off-by: Nick Thompson <nick.thompson@ge.com>
> Reviewed-by: Ben Gardiner <bengardiner@nanometrics.ca>

Applied to u-boot-ti

--Sandeep
diff mbox

Patch

diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 1feada9..3a2631b 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -47,8 +47,7 @@ 
  * Memory Info
  */
 #define CONFIG_SYS_MALLOC_LEN	(0x10000 + 1*1024*1024) /* malloc() len */
-#define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
-#define PHYS_SDRAM_1_SIZE	(64 << 20) /* SDRAM size 64MB */
+#define PHYS_SDRAM_1			0xc0000000 /* SDRAM Start */
 #define CONFIG_SYS_MEMTEST_START	PHYS_SDRAM_1 /* memtest start addr */
 #define CONFIG_SYS_MEMTEST_END 	(PHYS_SDRAM_1 + 16*1024*1024) /* 16MB test */
 #define CONFIG_NR_DRAM_BANKS	1 /* we have 1 bank of DRAM */
@@ -280,4 +279,11 @@ 
 	"mtdparts=davinci_nand.1:" PART_BOOT PART_PARAMS PART_KERNEL PART_REST
 #endif
 
+#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+
+/* additions for new relocation code, must be added to all boards */
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR		\
+	(CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
+
 #endif /* __CONFIG_H */