diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2010-01-13 17:34:25 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2010-01-13 17:34:25 +0100 |
| commit | c8f05f17eb440b3ef88d9417bf02797475583737 (patch) | |
| tree | 81e1bf25dd75b1bad7ba738dd15eb76d882912ea /common | |
| parent | 074f516bda136e5464499fc63a854d8469f8e9fb (diff) | |
| parent | 2ff6922280025c1315c53fa2eb4ab33f0c9591de (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_onenand.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common/env_onenand.c b/common/env_onenand.c index 23d2caa62..cf997bf7e 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -60,15 +60,18 @@ uchar env_get_char_spec(int index) void env_relocate_spec(void) { struct mtd_info *mtd = &onenand_mtd; +#ifdef CONFIG_ENV_ADDR_FLEX struct onenand_chip *this = &onenand_chip; +#endif loff_t env_addr; int use_default = 0; size_t retlen; env_addr = CONFIG_ENV_ADDR; +#ifdef CONFIG_ENV_ADDR_FLEX if (FLEXONENAND(this)) env_addr = CONFIG_ENV_ADDR_FLEX; - +#endif /* Check OneNAND exist */ if (mtd->writesize) /* Ignore read fail */ @@ -94,7 +97,9 @@ void env_relocate_spec(void) int saveenv(void) { struct mtd_info *mtd = &onenand_mtd; +#ifdef CONFIG_ENV_ADDR_FLEX struct onenand_chip *this = &onenand_chip; +#endif loff_t env_addr = CONFIG_ENV_ADDR; struct erase_info instr = { .callback = NULL, @@ -102,12 +107,14 @@ int saveenv(void) size_t retlen; instr.len = CONFIG_ENV_SIZE; +#ifdef CONFIG_ENV_ADDR_FLEX if (FLEXONENAND(this)) { env_addr = CONFIG_ENV_ADDR_FLEX; instr.len = CONFIG_ENV_SIZE_FLEX; instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ? 1 : 0; } +#endif instr.addr = env_addr; instr.mtd = mtd; if (mtd->erase(mtd, &instr)) { |