diff options
author | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
commit | 083d506937002f2795c80fe0c3ae194ad2c3d085 (patch) | |
tree | 3f7685842824cbd42c290d575d39a7dd3d01bccd /board/logicpd/imx31_litekit | |
parent | b485556be51d1edae0a2c0065e2f572ca42a1eee (diff) | |
parent | b952c24adeb7bfdb09f60d5d1f49fa86a2686c1c (diff) | |
download | u-boot-imx-083d506937002f2795c80fe0c3ae194ad2c3d085.zip u-boot-imx-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.gz u-boot-imx-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Conflicts:
board/logicpd/imx31_litekit/config.mk
boards.cfg
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/logicpd/imx31_litekit')
-rw-r--r-- | board/logicpd/imx31_litekit/config.mk | 2 | ||||
-rw-r--r-- | board/logicpd/imx31_litekit/imx31_litekit.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/board/logicpd/imx31_litekit/config.mk b/board/logicpd/imx31_litekit/config.mk index 0131edf..a7887ba 100644 --- a/board/logicpd/imx31_litekit/config.mk +++ b/board/logicpd/imx31_litekit/config.mk @@ -1 +1 @@ -CONFIG_SYS_TEXT_BASE = 0x87f00000 +CONFIG_SYS_TEXT_BASE = 0xa0000000 diff --git a/board/logicpd/imx31_litekit/imx31_litekit.c b/board/logicpd/imx31_litekit/imx31_litekit.c index 2ac622d..a07ba0e 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 */ |