diff options
| author | Heiko Schocher <hs@denx.de> | 2010-09-17 13:10:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-19 19:29:54 +0200 |
| commit | ab86f72c354f9b2572340f72b74ca0a258c451bd (patch) | |
| tree | 33cadeb2dbb7f31824789189621305d6eda772ab /board/keymile | |
| parent | 561142af20f1fd7b425d9425730014e656defb91 (diff) | |
| download | blackbird-obmc-uboot-ab86f72c354f9b2572340f72b74ca0a258c451bd.tar.gz blackbird-obmc-uboot-ab86f72c354f9b2572340f72b74ca0a258c451bd.zip | |
ARM: implement relocation for ARM926
Change the implementation for arm926 to relocate the code to
an arbitrary address in RAM.
Adapt the TX25 (i.MX25), magnesium board to test the changes.
On the tx25 board TEXT_BASE is set to the final relocation
address to prevent one more copying of u-boot code
when relocating. More info see:
doc/README.arm-relocation
da850 board:
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Portions of this work were supported by funding from
the CE Linux Forum.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Ben Gardiner <bengardiner@nanometrics.ca>
Diffstat (limited to 'board/keymile')
| -rw-r--r-- | board/keymile/km_arm/km_arm.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index d7cbd7a2a9..7c0b858887 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -225,6 +225,7 @@ U_BOOT_CMD( ); #endif +#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) int dram_init(void) { int i; @@ -234,9 +235,32 @@ int dram_init(void) gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i), kw_sdram_bs(i)); } + + return 0; +} +#else +int dram_init(void) +{ + /* dram_init must store complete ramsize in gd->ram_size */ + /* Fix this */ + gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0), + kw_sdram_bs(0)); return 0; } +void dram_init_banksize(void) +{ + int i; + + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { + gd->bd->bi_dram[i].start = kw_sdram_bar(i); + gd->bd->bi_dram[i].size = kw_sdram_bs(i); + gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i), + kw_sdram_bs(i)); + } +} +#endif + /* Configure and enable MV88E1118 PHY */ void reset_phy(void) { |
