GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NAND: Do not write or read a whole block if it is larger than the environment

Browse source 
Environment can be smaller than NAND block size, do not need to read a whole
block and minimum for writing is one page. Also remove an unused variable.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Guennadi Liakhovetski 2008-07-31 12:38:26 +02:00 • committed by Scott Wood
parent eafcabd15f
commit c3db8c649c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/env_nand.c
View file

@ -159,22 +159,23 @@ int writeenv(size_t offset, u_char *buf)
{ {
size_t end = offset + CFG_ENV_RANGE; size_t end = offset + CFG_ENV_RANGE;
size_t amount_saved = 0; size_t amount_saved = 0;
size_t blocksize; size_t blocksize, len;
u_char *char_ptr; u_char *char_ptr;
blocksize = nand_info[0].erasesize; blocksize = nand_info[0].erasesize;
len = min(blocksize, CFG_ENV_SIZE);
while (amount_saved < CFG_ENV_SIZE && offset < end) { while (amount_saved < CFG_ENV_SIZE && offset < end) {
if (nand_block_isbad(&nand_info[0], offset)) { if (nand_block_isbad(&nand_info[0], offset)) {
offset += blocksize; offset += blocksize;
} else { } else {
char_ptr = &buf[amount_saved]; char_ptr = &buf[amount_saved];
if (nand_write(&nand_info[0], offset, &blocksize, if (nand_write(&nand_info[0], offset, &len,
char_ptr)) char_ptr))
return 1; return 1;
offset += blocksize; offset += blocksize;
amount_saved += blocksize; amount_saved += len;
} }
} }
if (amount_saved != CFG_ENV_SIZE) if (amount_saved != CFG_ENV_SIZE)
@ -261,21 +262,22 @@ int readenv (size_t offset, u_char * buf)
{ {
size_t end = offset + CFG_ENV_RANGE; size_t end = offset + CFG_ENV_RANGE;
size_t amount_loaded = 0; size_t amount_loaded = 0;
size_t blocksize; size_t blocksize, len;
u_char *char_ptr; u_char *char_ptr;
blocksize = nand_info[0].erasesize; blocksize = nand_info[0].erasesize;
len = min(blocksize, CFG_ENV_SIZE);
while (amount_loaded < CFG_ENV_SIZE && offset < end) { while (amount_loaded < CFG_ENV_SIZE && offset < end) {
if (nand_block_isbad(&nand_info[0], offset)) { if (nand_block_isbad(&nand_info[0], offset)) {
offset += blocksize; offset += blocksize;
} else { } else {
char_ptr = &buf[amount_loaded]; char_ptr = &buf[amount_loaded];
if (nand_read(&nand_info[0], offset, &blocksize, char_ptr)) if (nand_read(&nand_info[0], offset, &len, char_ptr))
return 1; return 1;
offset += blocksize; offset += blocksize;
amount_loaded += blocksize; amount_loaded += len;
} }
} }
if (amount_loaded != CFG_ENV_SIZE) if (amount_loaded != CFG_ENV_SIZE)
@ -345,12 +347,10 @@ void env_relocate_spec (void)
void env_relocate_spec (void) void env_relocate_spec (void)
{ {
#if !defined(ENV_IS_EMBEDDED) #if !defined(ENV_IS_EMBEDDED)
size_t total;
int ret; int ret;
total = CFG_ENV_SIZE;
ret = readenv(CFG_ENV_OFFSET, (u_char *) env_ptr); ret = readenv(CFG_ENV_OFFSET, (u_char *) env_ptr);
if (ret || total != CFG_ENV_SIZE) if (ret)
return use_default(); return use_default();
if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc) if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)