leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/wd/git/u-boot/custodians

Browse Source 
* 'master' of /home/wd/git/u-boot/custodians:
  cmd_nand: fix help of nand erase subcommand
  env_nand: zero-initialize variable nand_erase_options
This commit is contained in:
Wolfgang Denk 2011-06-01 21:59:27 +02:00
commit 8aebd75a4a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_nand.c
View File

@ -693,7 +693,7 @@ U_BOOT_CMD(
" write 'size' bytes starting at offset 'off' with yaffs format\n" " write 'size' bytes starting at offset 'off' with yaffs format\n"
" from memory address 'addr', skipping bad blocks.\n" " from memory address 'addr', skipping bad blocks.\n"
#endif #endif
"nand erase[.spread] [clean] [off [size]] - erase 'size' bytes " "nand erase[.spread] [clean] off size - erase 'size' bytes "
"from offset 'off'\n" "from offset 'off'\n"
" With '.spread', erase enough for given file size, otherwise,\n" " With '.spread', erase enough for given file size, otherwise,\n"
" 'size' includes skipped bad blocks.\n" " 'size' includes skipped bad blocks.\n"

8
common/env_nand.c
View File

@ -193,10 +193,8 @@ int saveenv(void)
int ret = 0; int ret = 0;
nand_erase_options_t nand_erase_options; nand_erase_options_t nand_erase_options;
memset(&nand_erase_options, 0, sizeof(nand_erase_options));
nand_erase_options.length = CONFIG_ENV_RANGE; nand_erase_options.length = CONFIG_ENV_RANGE;
nand_erase_options.quiet = 0;
nand_erase_options.jffs2 = 0;
nand_erase_options.scrub = 0;
if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE) if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE)
return 1; return 1;
@ -249,10 +247,8 @@ int saveenv(void)
char *res; char *res;
nand_erase_options_t nand_erase_options; nand_erase_options_t nand_erase_options;
memset(&nand_erase_options, 0, sizeof(nand_erase_options));
nand_erase_options.length = CONFIG_ENV_RANGE; nand_erase_options.length = CONFIG_ENV_RANGE;
nand_erase_options.quiet = 0;
nand_erase_options.jffs2 = 0;
nand_erase_options.scrub = 0;
nand_erase_options.offset = CONFIG_ENV_OFFSET; nand_erase_options.offset = CONFIG_ENV_OFFSET;
if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE) if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE)