summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:47:58 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:47:58 +0200
commit51bfee192099206a4397f15f3b93516e01f58ab0 (patch)
treec9a013e84f102cb7cd1777131691315178f6b6b0 /common
parentd8cc04d0ac9c7c0d12454708aaf5489f8532bbf9 (diff)
downloadblackbird-obmc-uboot-51bfee192099206a4397f15f3b93516e01f58ab0.tar.gz
blackbird-obmc-uboot-51bfee192099206a4397f15f3b93516e01f58ab0.zip
rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND
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_common.c2
-rw-r--r--common/env_nand.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index f3d84086c5..dc6d13af1c 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -56,7 +56,7 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CONFIG_ENV_IS_IN_EEPROM) && \
!defined(CFG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
- !defined(CFG_ENV_IS_IN_NAND) && \
+ !defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CFG_ENV_IS_IN_ONENAND) && \
!defined(CFG_ENV_IS_IN_SPI_FLASH) && \
!defined(CFG_ENV_IS_NOWHERE)
diff --git a/common/env_common.c b/common/env_common.c
index d51c2114de..e89f1920d2 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -133,7 +133,7 @@ uchar default_environment[] = {
"\0"
};
-#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
+#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
|| defined(CFG_ENV_IS_IN_SPI_FLASH)
int default_environment_size = sizeof(default_environment);
#endif
diff --git a/common/env_nand.c b/common/env_nand.c
index a8f0de7ae2..53e31834c7 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -34,7 +34,7 @@
#include <common.h>
-#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
+#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
#include <command.h>
#include <environment.h>
@@ -367,4 +367,4 @@ static void use_default()
}
#endif
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
OpenPOWER on IntegriCloud