diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-09 17:25:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-09 17:25:22 +0200 |
| commit | c19c3134799585c9feaad63a420fe6e704f2f2a4 (patch) | |
| tree | 4b4e3f194c4dc5697443c1b0ec5a605b2376da82 | |
| parent | 700a0c648df72f2c8e0589c0d0470b5ffd7cab7b (diff) | |
Fix compiler warnings with older GCC versions
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | common/cmd_flash.c | 25 |
2 files changed, 18 insertions, 9 deletions
@@ -2,6 +2,8 @@ Changes for U-Boot 1.1.3: ====================================================================== +* Fix compiler warnings with older GCC versions + * Add common (with Linux) MTD partition scheme and "mtdparts" command Old, obsolete and duplicated code was cleaned up and replace by the diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 0fb4dbb7ca..5ad4226b8b 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -664,6 +664,15 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) /**************************************************/ +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) +# define TMP_ERASE "erase <part-id>\n - erase partition\n" +# define TMP_PROT_ON "protect on <part-id>\n - protect partition\n" +# define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n" +#else +# define TMP_ERASE /* empty */ +# define TMP_PROT_ON /* empty */ +# define TMP_PROT_OFF /* empty */ +#endif U_BOOT_CMD( flinfo, 2, 1, do_flinfo, @@ -682,9 +691,7 @@ U_BOOT_CMD( "w/addr 'start'+'len'-1\n" "erase N:SF[-SL]\n - erase sectors SF-SL in FLASH bank # N\n" "erase bank N\n - erase FLASH bank # N\n" -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) - "erase <part-id>\n - erase partition\n" -#endif + TMP_ERASE "erase all\n - erase all FLASH banks\n" ); @@ -699,9 +706,7 @@ U_BOOT_CMD( "protect on N:SF[-SL]\n" " - protect sectors SF-SL in FLASH bank # N\n" "protect on bank N\n - protect FLASH bank # N\n" -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) - "protect on <part-id>\n - protect partition\n" -#endif + TMP_PROT_ON "protect on all\n - protect all FLASH banks\n" "protect off start end\n" " - make FLASH from addr 'start' to addr 'end' writable\n" @@ -711,10 +716,12 @@ U_BOOT_CMD( "protect off N:SF[-SL]\n" " - make sectors SF-SL writable in FLASH bank # N\n" "protect off bank N\n - make FLASH bank # N writable\n" -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) - "protect off <part-id>\n - make partition writable\n" -#endif + TMP_PROT_OFF "protect off all\n - make all FLASH banks writable\n" ); +#undef TMP_ERASE +#undef TMP_PROT_ON +#undef TMP_PROT_OFF + #endif /* CFG_CMD_FLASH */ |