diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-13 23:01:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-10-13 23:01:27 +0200 |
| commit | b00583813214657696b0bbb756fa102b2e5cdccd (patch) | |
| tree | e0769c1455be11dee8eb130aee3946eaecc70b7f /lib_avr32 | |
| parent | 8f05a661e952f0edfefb985a5be4ad3c721a897e (diff) | |
| parent | 7b624ad254b97e5a25dca2304a398b64aeedaffe (diff) | |
| download | u-boot-imx-b00583813214657696b0bbb756fa102b2e5cdccd.zip u-boot-imx-b00583813214657696b0bbb756fa102b2e5cdccd.tar.gz u-boot-imx-b00583813214657696b0bbb756fa102b2e5cdccd.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
Diffstat (limited to 'lib_avr32')
| -rw-r--r-- | lib_avr32/board.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib_avr32/board.c b/lib_avr32/board.c index 8b9ca38..11d864f 100644 --- a/lib_avr32/board.c +++ b/lib_avr32/board.c @@ -310,10 +310,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) malloc_bin_reloc(); dma_alloc_init(); board_init_info(); - flash_init(); + + bd->bi_flashstart = 0; + bd->bi_flashsize = 0; + bd->bi_flashoffset = 0; + +#ifndef CFG_NO_FLASH + bd->bi_flashstart = CFG_FLASH_BASE; + bd->bi_flashsize = flash_init(); + bd->bi_flashoffset = (unsigned long)_edata - (unsigned long)_text; if (bd->bi_flashsize) display_flash_config(); +#endif + if (bd->bi_dram[0].size) display_dram_config(); |