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

Fix OneNAND erase command

Browse source 
It mis-calculates the block address.
Also fix DECLARE_GLOBAL_DATA_PTR in env_onenand.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
This commit is contained in:
Kyungmin Park 2008-03-31 10:40:19 +09:00 • committed by Wolfgang Denk
parent 61525f2ffa
commit a9da2b4107
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/cmd_onenand.c
View file

@ -44,14 +44,28 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
default: default:
/* At least 4 args */ /* At least 4 args */
if (strncmp(argv[1], "erase", 5) == 0) { if (strncmp(argv[1], "erase", 5) == 0) {
struct erase_info instr; struct erase_info instr = {
.callback = NULL,
};
ulong start, end; ulong start, end;
ulong block; ulong block;
char *endtail;
start = simple_strtoul(argv[2], NULL, 10); if (strncmp(argv[2], "block", 5) == 0) {
end = simple_strtoul(argv[3], NULL, 10); start = simple_strtoul(argv[3], NULL, 10);
start -= (unsigned long)onenand_chip.base; endtail = strchr(argv[3], '-');
end -= (unsigned long)onenand_chip.base; end = simple_strtoul(endtail + 1, NULL, 10);
} else {
start = simple_strtoul(argv[2], NULL, 10);
end = simple_strtoul(argv[3], NULL, 10);
start -= (unsigned long)onenand_chip.base;
end -= (unsigned long)onenand_chip.base;
start >>= onenand_chip.erase_shift;
end >>= onenand_chip.erase_shift;
/* Don't include the end block */
end--;
}
if (!end || end < 0) if (!end || end < 0)
end = start; end = start;

15
common/env_onenand.c
View file

@ -52,22 +52,21 @@ static unsigned char onenand_env[MAX_ONENAND_PAGESIZE];
env_t *env_ptr = (env_t *) onenand_env; env_t *env_ptr = (env_t *) onenand_env;
#endif /* ENV_IS_EMBEDDED */ #endif /* ENV_IS_EMBEDDED */
DECLARE_GLOBAL_DATA_PTR;
uchar env_get_char_spec(int index) uchar env_get_char_spec(int index)
{ {
DECLARE_GLOBAL_DATA_PTR;
return (*((uchar *) (gd->env_addr + index))); return (*((uchar *) (gd->env_addr + index)));
} }
void env_relocate_spec(void) void env_relocate_spec(void)
{ {
DECLARE_GLOBAL_DATA_PTR;
unsigned long env_addr; unsigned long env_addr;
int use_default = 0; int use_default = 0;
size_t retlen; size_t retlen;
env_addr = CFG_ENV_ADDR; env_addr = CFG_ENV_ADDR;
env_addr -= (unsigned long)onenand_chip.base; env_addr -= (unsigned long) onenand_chip.base;
/* Check OneNAND exist */ /* Check OneNAND exist */
if (onenand_mtd.oobblock) if (onenand_mtd.oobblock)
@ -95,7 +94,9 @@ void env_relocate_spec(void)
int saveenv(void) int saveenv(void)
{ {
unsigned long env_addr = CFG_ENV_ADDR; unsigned long env_addr = CFG_ENV_ADDR;
struct erase_info instr; struct erase_info instr = {
.callback = NULL,
};
size_t retlen; size_t retlen;
instr.len = CFG_ENV_SIZE; instr.len = CFG_ENV_SIZE;
@ -108,7 +109,7 @@ int saveenv(void)
/* update crc */ /* update crc */
env_ptr->crc = env_ptr->crc =
crc32(0, env_ptr->data, onenand_mtd.oobblock - ENV_HEADER_SIZE); crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd));
env_addr -= (unsigned long)onenand_chip.base; env_addr -= (unsigned long)onenand_chip.base;
if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen, if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,
@ -122,8 +123,6 @@ int saveenv(void)
int env_init(void) int env_init(void)
{ {
DECLARE_GLOBAL_DATA_PTR;
/* use default */ /* use default */
gd->env_addr = (ulong) & default_environment[0]; gd->env_addr = (ulong) & default_environment[0];
gd->env_valid = 1; gd->env_valid = 1;