summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:04 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:04 +0200
commit5a1aceb0689e2f731491838970884a673ef7e7d3 (patch)
treeecd34fd2a8454ff2fc1d67d81f193dd8313e77ef /common
parent7d9b5bae5ba558c7464d89d033aca04acaf01172 (diff)
rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_nvedit.c2
-rw-r--r--common/env_flash.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index fc9b94e0ec2..f5b93df220e 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_ENV_IS_IN_NVRAM) && \
!defined(CONFIG_ENV_IS_IN_EEPROM) && \
- !defined(CFG_ENV_IS_IN_FLASH) && \
+ !defined(CONFIG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
!defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND) && \
diff --git a/common/env_flash.c b/common/env_flash.c
index a92160ddfb3..c287b17404d 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -28,7 +28,7 @@
#include <common.h>
-#if defined(CFG_ENV_IS_IN_FLASH) /* Environment is in Flash */
+#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */
#include <command.h>
#include <environment.h>
@@ -384,4 +384,4 @@ void env_relocate_spec (void)
#endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
}
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */