mpc83xx: wait till UPM completes the write to array

[karo-tx-uboot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index f5b93df220e631716b702661e111028781f1626d..637d6c948d5f26bde36e00010a62b8014c3ee1fd 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -60,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_ONENAND) && \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)       && \
     !defined(CONFIG_ENV_IS_NOWHERE)
-# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
+# error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
 
 #define XMK_STR(x)     #x
@@ -503,7 +503,7 @@ char *getenv (char *name)
                int val;
 
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
-                       if (nxt >= CFG_ENV_SIZE) {
+                       if (nxt >= CONFIG_ENV_SIZE) {
                                return (NULL);
                        }
                }
@@ -523,7 +523,7 @@ int getenv_r (char *name, char *buf, unsigned len)
                int val, n;
 
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
-                       if (nxt >= CFG_ENV_SIZE) {
+                       if (nxt >= CONFIG_ENV_SIZE) {
                                return (-1);
                        }
                }