Commit dc8bbea removed a local variable that is used in most ARM boards.
Since we want to avoid an 'unused variable' warning with later compilers, and the #ifdef logic of whether this variable is required is bit painful, this declares the variable local to the block of code that needs it.
Signed-off-by: Simon Glass sjg@chromium.org --- arch/arm/lib/board.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c764844..3c147d1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -477,6 +477,8 @@ void board_init_r(gd_t *id, ulong dest_addr) flash_size = flash_init(); if (flash_size > 0) { # ifdef CONFIG_SYS_FLASH_CHECKSUM + char *s; + print_size(flash_size, ""); /* * Compute and print flash CRC if flashchecksum is set to 'y' @@ -566,9 +568,13 @@ 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; + + s = getenv("bootfile"); + if (s != NULL) + copy_filename(BootFile, s, sizeof(BootFile)); + } #endif
#ifdef BOARD_LATE_INIT