diff options
| author | Magnus Lilja <lilja.magnus@gmail.com> | 2010-10-16 19:47:06 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2010-10-19 12:29:31 +0200 |
| commit | 68a75d0b544fb8e7efb85bed1597285f61186cef (patch) | |
| tree | 506688ab69b4db898a1bd0f8fab05ea6c399eef1 | |
| parent | 65e62d69415acd4cf8c297b8df7076694e796802 (diff) | |
| download | olio-uboot-2014.01-68a75d0b544fb8e7efb85bed1597285f61186cef.tar.xz olio-uboot-2014.01-68a75d0b544fb8e7efb85bed1597285f61186cef.zip | |
i.MX31: Fix Litekit board to use new ARM relocation support.
Tested on hardware. Boots Linux nicely.
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| -rw-r--r-- | board/logicpd/imx31_litekit/config.mk | 2 | ||||
| -rw-r--r-- | board/logicpd/imx31_litekit/imx31_litekit.c | 10 | ||||
| -rw-r--r-- | include/configs/imx31_litekit.h | 7 |
3 files changed, 16 insertions, 3 deletions
diff --git a/board/logicpd/imx31_litekit/config.mk b/board/logicpd/imx31_litekit/config.mk index d34dc02d9..a12c1824b 100644 --- a/board/logicpd/imx31_litekit/config.mk +++ b/board/logicpd/imx31_litekit/config.mk @@ -1 +1 @@ -TEXT_BASE = 0x87f00000 +TEXT_BASE = 0xa0000000 diff --git a/board/logicpd/imx31_litekit/imx31_litekit.c b/board/logicpd/imx31_litekit/imx31_litekit.c index 2ac622dbb..a07ba0efc 100644 --- a/board/logicpd/imx31_litekit/imx31_litekit.c +++ b/board/logicpd/imx31_litekit/imx31_litekit.c @@ -31,12 +31,18 @@ DECLARE_GLOBAL_DATA_PTR; int dram_init (void) { - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } +void +dram_init_banksize (void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; +} + int board_init (void) { __REG(CSCR_U(0)) = 0x0000cf03; /* CS0: Nor Flash */ diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 88c62d11e..94252371b 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -147,6 +147,13 @@ #define PHYS_SDRAM_1 CSD0_BASE #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) +#undef CONFIG_SYS_ARM_WITHOUT_RELOC +#define CONFIG_SYS_SDRAM_BASE CSD0_BASE +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_END IRAM_SIZE +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET) + /*----------------------------------------------------------------------- * FLASH and environment organization */ |