diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-06-08 23:29:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-06-08 23:29:04 +0200 |
| commit | 9571865e0d32b1bcf8a6625497d1cd5d4bbad354 (patch) | |
| tree | 314afe1d1b53adbca24e6c3a9cf2c45741cdb4ba /board/freescale/mx31ads/mx31ads.c | |
| parent | ba5c1228463c19395d1cf4b88d4bae7171fe6d98 (diff) | |
| parent | 84b80856387a72c38586075c9a6795e4face7693 (diff) | |
| download | u-boot-imx-9571865e0d32b1bcf8a6625497d1cd5d4bbad354.zip u-boot-imx-9571865e0d32b1bcf8a6625497d1cd5d4bbad354.tar.gz u-boot-imx-9571865e0d32b1bcf8a6625497d1cd5d4bbad354.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm:
SMDK6400: fix the compiler error
imx27lite: Remove local config.mk
mx31ads: Fix environment location on flash
imx31_litekit: Remove local config.mk
mx31litekit: Fix boot with the new relocation scheme.
mx31ads: Use the new relocation scheme
Diffstat (limited to 'board/freescale/mx31ads/mx31ads.c')
| -rw-r--r-- | board/freescale/mx31ads/mx31ads.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/board/freescale/mx31ads/mx31ads.c b/board/freescale/mx31ads/mx31ads.c index a298e05..9bf9c18 100644 --- a/board/freescale/mx31ads/mx31ads.c +++ b/board/freescale/mx31ads/mx31ads.c @@ -28,15 +28,21 @@ DECLARE_GLOBAL_DATA_PTR; -int dram_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_1, + 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; - - return 0; } -int board_init (void) +int board_early_init_f(void) { int i; @@ -94,6 +100,11 @@ int board_init (void) readb(CS4_BASE + 8); readb(CS4_BASE + 7); + return 0; +} + +int board_init(void) +{ gd->bd->bi_arch_number = MACH_TYPE_MX31ADS; /* board id for linux */ gd->bd->bi_boot_params = 0x80000100; /* adress of boot parameters */ |