diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-16 22:49:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-16 22:49:16 +0100 |
| commit | b5d58d8500bfb918c7fec56f241e6ee1078c2be0 (patch) | |
| tree | d6b3d515f9b8fb70d9c6a195414ca0880d64fbfa /board | |
| parent | 37805cf1db0adbc01f181ec806f0732999764099 (diff) | |
| parent | 6741b5310f81ae5ae0132ad85b09fb31d6377b6c (diff) | |
| download | u-boot-imx-b5d58d8500bfb918c7fec56f241e6ee1078c2be0.zip u-boot-imx-b5d58d8500bfb918c7fec56f241e6ee1078c2be0.tar.gz u-boot-imx-b5d58d8500bfb918c7fec56f241e6ee1078c2be0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board')
| -rw-r--r-- | board/ronetix/pm9261/config.mk | 1 | ||||
| -rw-r--r-- | board/ronetix/pm9261/pm9261.c | 9 | ||||
| -rw-r--r-- | board/ronetix/pm9263/config.mk | 1 | ||||
| -rw-r--r-- | board/ronetix/pm9263/pm9263.c | 9 | ||||
| -rw-r--r-- | board/ronetix/pm9g45/config.mk | 1 | ||||
| -rw-r--r-- | board/ronetix/pm9g45/pm9g45.c | 9 |
6 files changed, 24 insertions, 6 deletions
diff --git a/board/ronetix/pm9261/config.mk b/board/ronetix/pm9261/config.mk deleted file mode 100644 index 975522a..0000000 --- a/board/ronetix/pm9261/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x23f00000
\ No newline at end of file diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 53d8c48..e0f44dd 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -281,9 +281,16 @@ int board_eth_init(bd_t *bis) int dram_init(void) { + /* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM, + PHYS_SDRAM_SIZE); + return 0; +} + +void dram_init_banksize(void) +{ gd->bd->bi_dram[0].start = PHYS_SDRAM; gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; - return 0; } #ifdef CONFIG_RESET_PHY_R diff --git a/board/ronetix/pm9263/config.mk b/board/ronetix/pm9263/config.mk deleted file mode 100644 index e554a45..0000000 --- a/board/ronetix/pm9263/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x23f00000 diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index 4dc0237..ec9f865 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -378,9 +378,16 @@ int board_init(void) int dram_init(void) { + /* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM, + PHYS_SDRAM_SIZE); + return 0; +} + +void dram_init_banksize(void) +{ gd->bd->bi_dram[0].start = PHYS_SDRAM; gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; - return 0; } #ifdef CONFIG_RESET_PHY_R diff --git a/board/ronetix/pm9g45/config.mk b/board/ronetix/pm9g45/config.mk deleted file mode 100644 index 9d3c5ae..0000000 --- a/board/ronetix/pm9g45/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x73f00000 diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index f3d48f2..79b7c9d 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -159,9 +159,16 @@ int board_init(void) int dram_init(void) { + /* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM, + PHYS_SDRAM_SIZE); + return 0; +} + +void dram_init_banksize(void) +{ gd->bd->bi_dram[0].start = PHYS_SDRAM; gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; - return 0; } #ifdef CONFIG_RESET_PHY_R |