From 1a4664b53aaf23687b52d64b94be06a9aa260b86 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sun, 19 Jul 2009 19:32:37 +0200 Subject: cmd_flash.c: fix fix compile error for boards with DataFlash Commit 5669ed45 ("cmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'") changed the #ifdef logic areound the declaration of these variables and missed a combination of settings of HAS_DATAFLASH with SYS_NO_FLASH; this patch fixes this. Also spotted by Alessandro Rubini Signed-off-by: Wolfgang Denk --- common/cmd_flash.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/cmd_flash.c b/common/cmd_flash.c index bc651fa1fd4..3773412549b 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -467,8 +467,10 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) flash_info_t *info; ulong bank; int i, n, sect_first, sect_last; - ulong addr_first, addr_last; #endif /* CONFIG_SYS_NO_FLASH */ +#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) + ulong addr_first, addr_last; +#endif #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) struct mtd_device *dev; struct part_info *part; -- cgit v1.2.3