da830: fixup ARM relocation support
PATCH v2 1/1 da830: fixup ARM relocation support
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.
---
Changes since v1:
removed CONFIG_SKIP_RELOCATE_UBOOT
include/configs/da830evm.h | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
include/configs/da830evm.h +9 -3
@@ -41,15 +41,13 @@#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID)#define CONFIG_SYS_HZ 1000#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ /* * Memory Info */ #define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024)/* malloc() len */ #define CONFIG_SYS_GBL_DATA_SIZE 128/* reserved for initial data */ -#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 */
@@ -281,4 +279,12 @@ "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 */ +#undef CONFIG_SYS_ARM_WITHOUT_RELOC +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 0x1000 - CONFIG_SYS_GBL_DATA_SIZE) +#endif /* __CONFIG_H */
Signature · 1 line
1.7.0.4
PATCH v2 1/1 da830: fixup ARM relocation support
Quoted 8 lines · Nick Thompson
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.hresulting in build failure in the common code.
Quoted 7 lines
This patch adds those defines for da830, but makes no sense without also referring to the commit mentioned above.
Signed-off-by Nick Thompson <[email protected]>---
Changes since v1:
removedCONFIG_SKIP_RELOCATE_UBOOT
This makes the da830 setup equivalent to the da850 setup in -next; with the potential possibility that CONFIG_SKIP_RELOCATE_UBOOT could be defined.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca