minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 19:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

AVR32: Initialize bi_flash* in board_init_r

Browse Source 
The ATSTK1000-specific flash driver intializes bi_flashstart,
bi_flashsize and bi_flashoffset, but other flash drivers, like the CFI
driver, don't.

Initialize these in board_init_r instead so that things will still be
set up correctly when we switch to the CFI driver.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
This commit is contained in:
Haavard Skinnemoen 2007-10-06 18:55:35 +02:00
parent 9add9884b1
commit 7b624ad254
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/atmel/atstk1000/flash.c
View File

@ -55,10 +55,6 @@ unsigned long flash_init(void)
unsigned long addr; unsigned long addr;
unsigned int i; unsigned int i;
gd->bd->bi_flashstart = CFG_FLASH_BASE;
gd->bd->bi_flashsize = CFG_FLASH_SIZE;
gd->bd->bi_flashoffset = _edata - _text;
flash_info[0].size = CFG_FLASH_SIZE; flash_info[0].size = CFG_FLASH_SIZE;
flash_info[0].sector_count = 135; flash_info[0].sector_count = 135;

12
lib_avr32/board.c
View File

@ -310,10 +310,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
malloc_bin_reloc(); malloc_bin_reloc();
dma_alloc_init(); dma_alloc_init();
board_init_info(); 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) if (bd->bi_flashsize)
display_flash_config(); display_flash_config();
#endif
if (bd->bi_dram[0].size) if (bd->bi_dram[0].size)
display_dram_config(); display_dram_config();