cmd_dasa_sim.c: Fix GCC 4.6 build warnings

[u-boot] / arch / nios2 / lib / board.c

diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c
index f83e691a3498219c49e79576b06cbc7f5e7cf391..65de26e5c9351229d4461588a07efd6b694519d7 100644 (file)
--- a/arch/nios2/lib/board.c
+++ b/arch/nios2/lib/board.c
@@ -95,7 +95,7 @@ void board_init (void)
        /* compiler optimization barrier needed for GCC >= 3.4 */
        __asm__ __volatile__("": : :"memory");
 
-       memset( gd, 0, CONFIG_SYS_GBL_DATA_SIZE );
+       memset( gd, 0, GENERATED_GBL_DATA_SIZE );
 
        gd->bd = (bd_t *)(gd+1);        /* At end of global data */
        gd->baudrate = CONFIG_BAUDRATE;
@@ -158,9 +158,7 @@ void board_init (void)
 #endif
 
 #if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
        puts ("Net:   ");
-#endif
        eth_initialize (bd);
 #endif