diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-10-14 14:33:32 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-10-14 14:33:32 +0200 |
| commit | e58ade3a5c0df399f13dffb897ee9ddbc30d7302 (patch) | |
| tree | 5e6e1e7cd2b97e3ca9c4eed122327327d09dfda8 /lib_avr32 | |
| parent | 95df6f4ebaaa3972e312be1acf7650a18b84bf3d (diff) | |
| parent | 636400198228d96983c06657b17f760f5989958e (diff) | |
| download | u-boot-imx-e58ade3a5c0df399f13dffb897ee9ddbc30d7302.zip u-boot-imx-e58ade3a5c0df399f13dffb897ee9ddbc30d7302.tar.gz u-boot-imx-e58ade3a5c0df399f13dffb897ee9ddbc30d7302.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
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(); |