rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

[platform/kernel/u-boot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index aaf6d98..08671f2 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -52,11 +52,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CFG_ENV_IS_IN_NVRAM)      && \
-    !defined(CFG_ENV_IS_IN_EEPROM)     && \
+#if !defined(CONFIG_ENV_IS_IN_NVRAM)   && \
+    !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
     !defined(CFG_ENV_IS_IN_FLASH)      && \
-    !defined(CFG_ENV_IS_IN_DATAFLASH)  && \
-    !defined(CFG_ENV_IS_IN_NAND)       && \
+    !defined(CONFIG_ENV_IS_IN_DATAFLASH)       && \
+    !defined(CONFIG_ENV_IS_IN_NAND)    && \
     !defined(CFG_ENV_IS_IN_ONENAND)    && \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)  && \
     !defined(CFG_ENV_IS_NOWHERE)
@@ -99,7 +99,8 @@ int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                }
 
-               printf("\nEnvironment size: %d/%ld bytes\n", i, ENV_SIZE);
+               printf("\nEnvironment size: %d/%ld bytes\n",
+                       i, (ulong)ENV_SIZE);
 
                return 0;
        }
@@ -539,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len)
        return (-1);
 }
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_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))) \
@@ -595,7 +596,7 @@ U_BOOT_CMD(
        "    - delete environment variable 'name'\n"
 );
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_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))) \