Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2

[oweals/u-boot.git] / lib_avr32 / board.c

diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index 265328aa487696a11862aa12ae6e491fd60e64cb..809ee3be92c29665861cef4fd296b0c15931d3d6 100644 (file)
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -310,10 +310,22 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        malloc_bin_reloc();
        dma_alloc_init();
        board_init_info();
-       flash_init();
+
+       enable_interrupts();
+
+       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();
 
@@ -328,7 +340,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        jumptable_init();
        console_init_r();
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
        puts("Net:   ");
 #endif