cmd_flash.c: fix compile error for boards with DataFlash
PATCH 1/1 cmd_flash.c: fix compile error for boards with DataFlash
From: Alessandro Rubini <[email protected]>
The local variables addr_first and addr_last are used if HAS_DATAFLASH even if SYS_NO_FLASH (meaning no NOR flash). This adds the definitions withing the brace where the names are used, to avoid cluttering the initial ifdef.
---
5 boards were not compiling with "./MAKEALL arm", now they all work. Actually, even at91sam9263ek_nandflash_config was in error, but it's not one of the MAKEALL targets. Should MAKEALL test all possible configs or not?
common/cmd_flash.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
common/cmd_flash.c +2 -0
@@ -496,6 +496,8 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])#ifdef CONFIG_HAS_DATAFLASH if ((strcmp (argv[2 ],"all" ) !=0 ) && (strcmp (argv[2 ],"bank" ) !=0 )) { +ulong addr_first, addr_last; + addr_first =simple_strtoul (argv[2 ],NULL ,16 ); addr_last =simple_strtoul (argv[3 ],NULL ,16 );
Signature · 1 line
1.6.0.2
PATCH 1/1 cmd_flash.c: fix compile error for boards with DataFlash
Dear Alessandro Rubini,
Quoted 8 lines · In message <[email protected]> you wrote:
From: Alessandro Rubini <[email protected]>
The local variables
addr_firstandaddr_lastare used ifHAS_DATAFLASHeven ifSYS_NO_FLASH(meaning no NOR flash). This adds the definitions withing the brace where the names are used, to avoid cluttering the initial ifdef.Signed-off-by Alessandro Rubini <[email protected]>
Yes, I ran into this myself, too. Unfortunaltely I must have overlooked these ARM error messages when I tested commit 5669ed45 ("cmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'").
Instead of adding another declaration for these variables as you are doing here, I prefer to change the #ifdef mess^H^H^H^Hlogic earlier in the file: