diff options
| author | Kyungmin Park <kmpark@infradead.org> | 2008-03-31 10:40:19 +0900 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-13 23:10:39 -0700 |
| commit | a9da2b41079d230db3a5641625311983f85ce1fb (patch) | |
| tree | f679cbdd19f5b3e91472c105ebd520c1e56f092b /common/env_onenand.c | |
| parent | 61525f2ffa156665a66908fda47dbf29d65ea579 (diff) | |
| download | talos-obmc-uboot-a9da2b41079d230db3a5641625311983f85ce1fb.tar.gz talos-obmc-uboot-a9da2b41079d230db3a5641625311983f85ce1fb.zip | |
Fix OneNAND erase command
It mis-calculates the block address.
Also fix DECLARE_GLOBAL_DATA_PTR in env_onenand.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'common/env_onenand.c')
| -rw-r--r-- | common/env_onenand.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/common/env_onenand.c b/common/env_onenand.c index 5888f75d89..ac8a8c15e7 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -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; |
