From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 10 Sep 2008 20:47:59 +0000 (+0200)
Subject: rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND
X-Git-Tag: v2008.10-rc2~9^2^2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9656138ff1a34d4c4768db6b490deffc40ee674b;p=u-boot

rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND

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

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 08671f271b..bfd097f95f 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -57,7 +57,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CFG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
-    !defined(CFG_ENV_IS_IN_ONENAND)	&& \
+    !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)	&& \
     !defined(CFG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
diff --git a/common/env_onenand.c b/common/env_onenand.c
index d5c907c6f0..4e466eaa4e 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
+#if defined(CONFIG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
 
 #include <command.h>
 #include <environment.h>
@@ -127,4 +127,4 @@ int env_init(void)
 	return 0;
 }
 
-#endif /* CFG_ENV_IS_IN_ONENAND */
+#endif /* CONFIG_ENV_IS_IN_ONENAND */
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index c93e77a2e2..6e34ddfef1 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -225,7 +225,7 @@
 
 /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
 #define	CFG_ONENAND_BASE	0x00000000
-#define	CFG_ENV_IS_IN_ONENAND	1
+#define	CONFIG_ENV_IS_IN_ONENAND	1
 #define CFG_ENV_ADDR		0x00020000
 
 #endif /* __CONFIG_H */