[U-Boot] [PATCH 16/25] rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 common/cmd_nvedit.c         |    2 +-
 common/env_common.c         |    2 +-
 common/env_sf.c             |    4 ++--
 include/configs/M54451EVB.h |    2 +-
 include/configs/M54455EVB.h |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index bfd097f..85d7108 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -58,7 +58,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
-    !defined(CFG_ENV_IS_IN_SPI_FLASH)	&& \
+    !defined(CONFIG_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}
 #endif
diff --git a/common/env_common.c b/common/env_common.c
index e89f192..36c46f0 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -134,7 +134,7 @@ uchar default_environment[] = {
 };
 
 #if defined(CONFIG_ENV_IS_IN_NAND)		/* Environment is in Nand Flash */ \
-	|| defined(CFG_ENV_IS_IN_SPI_FLASH)
+	|| defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 int default_environment_size = sizeof(default_environment);
 #endif
 
diff --git a/common/env_sf.c b/common/env_sf.c
index 9077d78..a442776 100644
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -27,7 +27,7 @@
  */
 #include <common.h>
 
-#ifdef CFG_ENV_IS_IN_SPI_FLASH
+#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 
 #include <environment.h>
 #include <spi_flash.h>
@@ -136,4 +136,4 @@ int env_init(void)
 	return 0;
 }
 
-#endif /* CFG_ENV_IS_IN_SPI_FLASH */
+#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 588c00c..fa1ef0b 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -267,7 +267,7 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #if defined(CONFIG_CF_SBF)
-#	define CFG_ENV_IS_IN_SPI_FLASH	1
+#	define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #	define CFG_ENV_SPI_CS		1
 #	define CFG_ENV_OFFSET		0x20000
 #	define CFG_ENV_SIZE		0x2000
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 476aba3..8b51148 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -331,7 +331,7 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifdef CONFIG_CF_SBF
-#	define CFG_ENV_IS_IN_SPI_FLASH
+#	define CONFIG_ENV_IS_IN_SPI_FLASH
 #	define CFG_ENV_SPI_CS		1
 #else
 #	define CFG_ENV_IS_IN_FLASH	1
-- 
1.5.6.3