arch/mips/lib/board.c: Fix GCC 4.6 build warning

[oweals/u-boot.git] / arch / mips / lib / board.c

diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 5fc63d5a78decc0d2d5e305e60c6484bbe199c6e..d998f0e74904416bcc7890c747b9990698bbb2e3 100644 (file)
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -259,7 +259,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
 #ifndef CONFIG_ENV_IS_NOWHERE
        extern char *env_name_spec;
 #endif
-       char *s;
        bd_t *bd;
 
        gd = id;
@@ -340,9 +339,12 @@ void board_init_r(gd_t *id, ulong dest_addr)
        /* Initialize from environment */
        load_addr = getenv_ulong("loadaddr", 16, load_addr);
 #if defined(CONFIG_CMD_NET)
-       s = getenv("bootfile");
-       if (s != NULL)
-               copy_filename(BootFile, s, sizeof(BootFile));
+       {
+               char *s = getenv("bootfile");
+
+               if (s != NULL)
+                       copy_filename(BootFile, s, sizeof(BootFile));
+       }
 #endif
 
 #ifdef CONFIG_CMD_SPI