rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index bfd097f95f12e772db1ff66911f5ceaa4931b578..85d7108c94db38998b46b27b4371cf54552152a3 100644 (file)
--- 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(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
     !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 e89f1920d20e3caa1952250e3ca3e867567c6c7a..36c46f0c91ad10639b77259aab9866708afeb369 100644 (file)
--- 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 */ \
 };
 
 #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
 
 int default_environment_size = sizeof(default_environment);
 #endif
 

diff --git a/common/env_sf.c b/common/env_sf.c
index 9077d783c344cbbd23026342309189cbf57b71c3..a4427764f2d3cdc3ce50817e83c35cb87d6a02e0 100644 (file)
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -27,7 +27,7 @@
  */
 #include <common.h>
 
  */
 #include <common.h>
 

-#ifdef CFG_ENV_IS_IN_SPI_FLASH
+#ifdef CONFIG_ENV_IS_IN_SPI_FLASH

 
 #include <environment.h>
 #include <spi_flash.h>
 
 #include <environment.h>
 #include <spi_flash.h>


@@ -136,4 +136,4 @@ int env_init(void)
        return 0;
 }
 
        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 cf58239df3f07c0f0b63933cba10839036e8e155..06e22443b3fecc74b15321337b046ccfd22117d1 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -266,7 +266,7 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #if defined(CONFIG_CF_SBF)
  * 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
 #      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 ad9c15eb9b1f4323ab1a7a0bf89095fa53502130..45a244fae7ab08dcba9d97888b0bafad2d3ae789 100644 (file)
--- 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
  * 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
 #      define CFG_ENV_SPI_CS           1
 #else
 #      define CFG_ENV_IS_IN_FLASH      1