diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-08 02:01:50 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-08 21:01:15 +0100 |
| commit | d3042862f65641222974908138647c46052313f3 (patch) | |
| tree | 4acbbfc893ba7ceeb542f86c2162590bd3daed36 /arch/mips/lib | |
| parent | cc257e42f39694a196bab609c1a62c7e35e68c4c (diff) | |
| download | u-boot-imx-d3042862f65641222974908138647c46052313f3.zip u-boot-imx-d3042862f65641222974908138647c46052313f3.tar.gz u-boot-imx-d3042862f65641222974908138647c46052313f3.tar.bz2 | |
arch/mips/lib/board.c: Fix GCC 4.6 build warning
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@denx.de>
Cc: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Diffstat (limited to 'arch/mips/lib')
| -rw-r--r-- | 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 |