[U-Boot] [PATCH 2/3] arch/mips/lib/board.c: Fix GCC 4.6 build warning
Wolfgang Denk
wd at denx.de
Thu Dec 8 13:01:50 CET 2011
Fix:
board.c: In function 'board_init_r':
board.c:262:8: warning: unused variable 's' [-Wunused-variable]
(raised for configurations without ethernet support like
vct_premium_small)
Signed-off-by: Wolfgang Denk <wd at denx.de>
Cc: Shinya Kuribayashi <skuribay at ruby.dti.ne.jp>
---
arch/mips/lib/board.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 5fc63d5..d998f0e 100644
--- 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
--
1.7.6.4
More information about the U-Boot
mailing list