rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH

[oweals/u-boot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index f3d84086c57af0980f5422551a5cd76c663da765..85d7108c94db38998b46b27b4371cf54552152a3 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -52,13 +52,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CFG_ENV_IS_IN_NVRAM)      && \
+#if !defined(CONFIG_ENV_IS_IN_NVRAM)   && \
     !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(CFG_ENV_IS_IN_ONENAND)    && \
-    !defined(CFG_ENV_IS_IN_SPI_FLASH)  && \
+    !defined(CONFIG_ENV_IS_IN_NAND)    && \
+    !defined(CONFIG_ENV_IS_IN_ONENAND) && \
+    !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
@@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len)
        return (-1);
 }
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
+#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
@@ -596,7 +596,7 @@ U_BOOT_CMD(
        "    - delete environment variable 'name'\n"
 );
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
+#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \