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