redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

Fix compiler warnings with older GCC versions

utp
Wolfgang Denk 2005-08-09 17:25:22 +02:00
parent 700a0c648d
commit c19c313479
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -2,6 +2,8 @@
Changes for U-Boot 1.1.3: Changes for U-Boot 1.1.3:
====================================================================== ======================================================================
* Fix compiler warnings with older GCC versions
* Add common (with Linux) MTD partition scheme and "mtdparts" command * Add common (with Linux) MTD partition scheme and "mtdparts" command
Old, obsolete and duplicated code was cleaned up and replace by the Old, obsolete and duplicated code was cleaned up and replace by the

25
common/cmd_flash.c
View File

@ -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( U_BOOT_CMD(
flinfo, 2, 1, do_flinfo, flinfo, 2, 1, do_flinfo,
@ -682,9 +691,7 @@ U_BOOT_CMD(
"w/addr 'start'+'len'-1\n" "w/addr 'start'+'len'-1\n"
"erase N:SF[-SL]\n - erase sectors SF-SL in FLASH bank # N\n" "erase N:SF[-SL]\n - erase sectors SF-SL in FLASH bank # N\n"
"erase bank N\n - erase FLASH bank # N\n" "erase bank N\n - erase FLASH bank # N\n"
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) TMP_ERASE
"erase <part-id>\n - erase partition\n"
#endif
"erase all\n - erase all FLASH banks\n" "erase all\n - erase all FLASH banks\n"
); );
@ -699,9 +706,7 @@ U_BOOT_CMD(
"protect on N:SF[-SL]\n" "protect on N:SF[-SL]\n"
" - protect sectors SF-SL in FLASH bank # N\n" " - protect sectors SF-SL in FLASH bank # N\n"
"protect on bank N\n - protect FLASH bank # N\n" "protect on bank N\n - protect FLASH bank # N\n"
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) TMP_PROT_ON
"protect on <part-id>\n - protect partition\n"
#endif
"protect on all\n - protect all FLASH banks\n" "protect on all\n - protect all FLASH banks\n"
"protect off start end\n" "protect off start end\n"
" - make FLASH from addr 'start' to addr 'end' writable\n" " - make FLASH from addr 'start' to addr 'end' writable\n"
@ -711,10 +716,12 @@ U_BOOT_CMD(
"protect off N:SF[-SL]\n" "protect off N:SF[-SL]\n"
" - make sectors SF-SL writable in FLASH bank # N\n" " - make sectors SF-SL writable in FLASH bank # N\n"
"protect off bank N\n - make FLASH bank # N writable\n" "protect off bank N\n - make FLASH bank # N writable\n"
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) TMP_PROT_OFF
"protect off <part-id>\n - make partition writable\n"
#endif
"protect off all\n - make all FLASH banks writable\n" "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 */ #endif /* CFG_CMD_FLASH */