V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Steve Sakoman 2010-09-29 20:59:51 -07:00 committed by Wolfgang Denk
parent 136c69ad79
commit 57b512b2ec
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/cpu/armv7/omap4/board.c
View File

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

4
board/ti/panda/config.mk
View File

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

3
board/ti/sdp4430/config.mk
View File

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

9
include/configs/omap4_panda.h
View File

@ -138,12 +138,6 @@
#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */
#undef CONFIG_CMD_IMLS /* List all found images */ #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 * Environment setup
*/ */
@ -233,4 +227,7 @@
*/ */
#define CONFIG_NR_DRAM_BANKS 1 #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 */ #endif /* __CONFIG_H */

9
include/configs/omap4_sdp4430.h
View File

@ -143,12 +143,6 @@
#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */
#undef CONFIG_CMD_IMLS /* List all found images */ #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 * Environment setup
*/ */
@ -238,4 +232,7 @@
*/ */
#define CONFIG_NR_DRAM_BANKS 1 #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 */ #endif /* __CONFIG_H */