diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:59 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:59 +0200 |
| commit | 9314cee6917444ab88bd4e758da7a30975120187 (patch) | |
| tree | 2207cd2624176839a828f3a2549d8084889872a5 /common | |
| parent | 06f61354397911a4c121dfa51b6ccbf7e300d48b (diff) | |
| download | u-boot-imx-9314cee6917444ab88bd4e758da7a30975120187.zip u-boot-imx-9314cee6917444ab88bd4e758da7a30975120187.tar.gz u-boot-imx-9314cee6917444ab88bd4e758da7a30975120187.tar.bz2 | |
rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nvedit.c | 6 | ||||
| -rw-r--r-- | common/env_nvram.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index dc6d13a..08671f2 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -52,7 +52,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if !defined(CFG_ENV_IS_IN_NVRAM) && \ +#if !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_EEPROM) && \ !defined(CFG_ENV_IS_IN_FLASH) && \ !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \ @@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len) return (-1); } -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ +#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ @@ -596,7 +596,7 @@ U_BOOT_CMD( " - delete environment variable 'name'\n" ); -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ +#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ diff --git a/common/env_nvram.c b/common/env_nvram.c index fa77719..c877f00 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -44,7 +44,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */ +#ifdef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */ #include <command.h> #include <environment.h> @@ -157,4 +157,4 @@ int env_init (void) return (0); } -#endif /* CFG_ENV_IS_IN_NVRAM */ +#endif /* CONFIG_ENV_IS_IN_NVRAM */ |