diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 |
| commit | afbc526336447a7357e9c82852df0377d09a8089 (patch) | |
| tree | 63360d749d3f02916a1239b3862c68d41d3f3d19 /common/env_onenand.c | |
| parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
| parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) | |
| download | olio-uboot-2014.01-afbc526336447a7357e9c82852df0377d09a8089.tar.xz olio-uboot-2014.01-afbc526336447a7357e9c82852df0377d09a8089.zip | |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/env_onenand.c')
| -rw-r--r-- | common/env_onenand.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/common/env_onenand.c b/common/env_onenand.c index d5c907c6f..3c65b3e48 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -22,9 +22,6 @@ */ #include <common.h> - -#if defined(CFG_ENV_IS_IN_ONENAND) /* Environment is in OneNAND */ - #include <command.h> #include <environment.h> #include <linux/stddef.h> @@ -65,7 +62,7 @@ void env_relocate_spec(void) int use_default = 0; size_t retlen; - env_addr = CFG_ENV_ADDR; + env_addr = CONFIG_ENV_ADDR; /* Check OneNAND exist */ if (onenand_mtd.writesize) @@ -92,13 +89,13 @@ void env_relocate_spec(void) int saveenv(void) { - unsigned long env_addr = CFG_ENV_ADDR; + unsigned long env_addr = CONFIG_ENV_ADDR; struct erase_info instr = { .callback = NULL, }; size_t retlen; - instr.len = CFG_ENV_SIZE; + instr.len = CONFIG_ENV_SIZE; instr.addr = env_addr; if (onenand_erase(&onenand_mtd, &instr)) { printf("OneNAND: erase failed at 0x%08lx\n", env_addr); @@ -126,5 +123,3 @@ int env_init(void) return 0; } - -#endif /* CFG_ENV_IS_IN_ONENAND */ |