commit 93f6d72544da4510a146bc4c93d609b0116cde37
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Wed Sep 10 22:48:00 2008 +0200
committer Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Wed Sep 10 22:48:00 2008 +0200
tree 5295b96f23662d7cf889a2c929fef8b2567710cc
parent 2556ef78113b5f089dfcac5da90bf31dd568397b

rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

common/cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 85d7108..fc9b94e 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -59,7 +59,7 @@
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
-    !defined(CFG_ENV_IS_NOWHERE)
+    !defined(CONFIG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
 
@@ -544,7 +544,7 @@
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	extern char * env_name_spec;
@@ -600,7 +600,7 @@
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 U_BOOT_CMD(
 	saveenv, 1, 0,	do_saveenv,
 	"saveenv - save environment variables to persistent storage\n",

common/env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index 36c46f0..c3946f0 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -246,7 +246,7 @@
 #endif
 
 	if (gd->env_valid == 0) {
-#if defined(CONFIG_GTH)	|| defined(CFG_ENV_IS_NOWHERE)	/* Environment not changable */
+#if defined(CONFIG_GTH)	|| defined(CONFIG_ENV_IS_NOWHERE)	/* Environment not changable */
 		puts ("Using default environment\n\n");
 #else
 		puts ("*** Warning - bad CRC, using default environment\n\n");

common/env_nowhere.c

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 17ecc77..8dd4867 100644
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -26,7 +26,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
+#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
 
 #include <command.h>
 #include <environment.h>
@@ -62,4 +62,4 @@
 	return (0);
 }
 
-#endif /* CFG_ENV_IS_NOWHERE) */
+#endif /* CONFIG_ENV_IS_NOWHERE) */