rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/board/xilinx/xilinx_enet/emac_adapter.c b/board/xilinx/xilinx_enet/emac_adapter.c
index d3403038e65e84a1375e68eed09f6ab109d4ea3f..0b100d215c70b7e15a8174620fa1ead9a1f8795b 100644 (file)
--- a/board/xilinx/xilinx_enet/emac_adapter.c
+++ b/board/xilinx/xilinx_enet/emac_adapter.c
@@ -56,7 +56,7 @@ static XEmac Emac;
 static char etherrxbuff[PKTSIZE_ALIGN];        /* Receive buffer */
 
 /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 static u8 EMACAddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
 #endif
 
@@ -87,7 +87,7 @@ eth_init(bd_t * bis)
        /* make sure the Emac is stopped before it is started */
        (void) XEmac_Stop(&Emac);
 
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
        memcpy(bis->bi_enetaddr, EMACAddr, 6);
 #endif
 

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 85d7108c94db38998b46b27b4371cf54552152a3..fc9b94e0ec25ffd3cf9071d1fa0493fe729a01f1 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -59,7 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_NAND)    && \
     !defined(CONFIG_ENV_IS_IN_ONENAND) && \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)       && \
-    !defined(CFG_ENV_IS_NOWHERE)
+    !defined(CONFIG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
 
@@ -544,7 +544,7 @@ int getenv_r (char *name, char *buf, unsigned len)
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        extern char * env_name_spec;
@@ -600,7 +600,7 @@ U_BOOT_CMD(
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 U_BOOT_CMD(
        saveenv, 1, 0,  do_saveenv,
        "saveenv - save environment variables to persistent storage\n",

diff --git a/common/env_common.c b/common/env_common.c
index 36c46f0c91ad10639b77259aab9866708afeb369..c3946f0a74cd84bc39a525407f62aa0e6081962c 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -246,7 +246,7 @@ void env_relocate (void)
 #endif
 
        if (gd->env_valid == 0) {
-#if defined(CONFIG_GTH)        || defined(CFG_ENV_IS_NOWHERE)  /* Environment not changable */
+#if defined(CONFIG_GTH)        || defined(CONFIG_ENV_IS_NOWHERE)       /* Environment not changable */
                puts ("Using default environment\n\n");
 #else
                puts ("*** Warning - bad CRC, using default environment\n\n");

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 17ecc775ff9bf0686a74b9926ee6c6438956dda8..8dd4867f1faf352312276543b8a172cfb8e505e6 100644 (file)
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -26,7 +26,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
+#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
 
 #include <command.h>
 #include <environment.h>
@@ -62,4 +62,4 @@ int  env_init(void)
        return (0);
 }
 
-#endif /* CFG_ENV_IS_NOWHERE) */
+#endif /* CONFIG_ENV_IS_NOWHERE) */

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 9ba4096e81adef3b820203c743fa0df729e39c7f..88cd0f9ff4f4a56e79554ec9add13f4fe2a03238 100644 (file)
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -73,7 +73,7 @@ static xemaclite emaclite;
 static char etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
 
 /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 static u8 emacaddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
 #else
 static u8 emacaddr[ENET_ADDR_LENGTH];

diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index 01ee72b8bc3f1d4cadd40fbecb5e828355acd990..cc91c8d11d0f54d622a262a16d2eb00d6f9a810b 100644 (file)
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -129,7 +129,7 @@
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else
-#define        CFG_ENV_IS_NOWHERE      1               /* NO Environment       */
+#define        CONFIG_ENV_IS_NOWHERE   1               /* NO Environment       */
 #endif
 
 /*------------------------------------------------------------------------

diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index fb066890741422a2945ceb8e5a6253a91b810487..965827823613133acce1876344a470a5e9e43325 100644 (file)
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -117,7 +117,7 @@
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else
-#define        CFG_ENV_IS_NOWHERE      1               /* NO Environment       */
+#define        CONFIG_ENV_IS_NOWHERE   1               /* NO Environment       */
 #endif
 
 /*------------------------------------------------------------------------

diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index 7a9ef79adcdbe9a2b5f4be2a58773871559b7c0e..e5bf8c7ccccc8c5f7b496b94dfbde2e43004665b 100644 (file)
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -133,7 +133,7 @@
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else
-#define        CFG_ENV_IS_NOWHERE      1               /* NO Environment       */
+#define        CONFIG_ENV_IS_NOWHERE   1               /* NO Environment       */
 #endif
 
 /*------------------------------------------------------------------------

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index fccf880abd0d404089face60583965b59a24c3f3..ecc344d8296e083676a91c2181cec1c233ab57e3 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -80,7 +80,7 @@
 #undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
   /* This is the 7bit address of the device, not including P. */
 #define CFG_I2C_EEPROM_ADDR 0x50

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index c17a2ea3c4ab8a10c09e42e5261caf51f00494bf..776fe9916016952047e42c6bf0df94f9c9e0040b 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -400,7 +400,7 @@
 
 /* Address and size of Redundant Environment Sector */
 #else
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 006b93a0bf7e76b28f363ea72cca082b9d57a350..1edd9ced4bea9d0d669b2f79537cf1d24e165eae 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -383,7 +383,7 @@
        #define CFG_ENV_SIZE            0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 94b3d5a337dd0fd7a81ed9b0afcde6d3b216091d..308f102161660274103cdfe1028066f5db5b8def 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -397,7 +397,7 @@
        #define CFG_ENV_SIZE            0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 401d0afc4d0f0cd00414a75426f653e986b8d055..b98f3ee18e0281a0f01520ee0960a6d01fe8bdec 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -409,7 +409,7 @@
        #define CFG_ENV_SIZE            0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index c8870b54ae10a02835e6ad22f1032d92aa44afd7..e03f5ca09219191ffe378a26eb6db1de9facb827 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -476,7 +476,7 @@
 
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 45ddd5c45151333875c54234a6dd11ccec7d59e8..7f5d303f001a6215e5a653a2389ae9925cc04ce6 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -420,7 +420,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #else
   #define CFG_NO_FLASH         /* Flash is not usable now */
   #undef  CONFIG_FLASH_CFI_DRIVER
-  #define CFG_ENV_IS_NOWHERE   /* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE        /* Store ENV in memory only */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 43d4118b66298f8303267cff10eba2c62299fb91..c532eb1fc05af9a54806ca3ad32b1baccdeaf483 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -440,7 +440,7 @@
        #define CFG_ENV_SIZE            0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 6898495b8db17e71e382615857a5303210c1abe9..47016005f2f06f96c035dffc4741b2561ae6dc51 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -345,7 +345,7 @@
 #define CFG_ENV_SIZE           0x20000
 #else /* CFG_RAMBOOT */
 #define CFG_NO_FLASH           1       /* Flash is not usable now */
-#define CFG_ENV_IS_NOWHERE     1       /* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE           0x2000
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f9c1b170d1d6eb690cabb56dcb66c994fc536949..220c148618fe77b714583a487bfceac1373badd6 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -427,7 +427,7 @@
        #define CFG_ENV_SIZE            0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 82b33530d903f6957047990ecf85227b927a3d13..289bcfaba4676d7c9b332af21a5858e208edab09 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -448,7 +448,7 @@
        #define CFG_ENV_SIZE            0x4000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE-0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 74f860536eec17d99577d2cda93cdf76386ed0c2..c23dcf66bff0e77098ae6b345c3fac77d859f127 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -387,7 +387,7 @@
   #define CFG_ENV_SIZE         0x2000
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 1073e23bfa5c163a3e73efc39831e0a900d6b33f..04bec2d02da7c9e12cac5cfdf0e131d793579e7a 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -256,7 +256,7 @@
 /* Environment */
 #ifndef CFG_RAMBOOT
 #if defined(CONFIG_RAM_AS_FLASH)
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x100000)
 #define CFG_ENV_SIZE           0x2000
 #else
@@ -267,7 +267,7 @@
 #define CFG_ENV_SIZE           0x2000
 #else
 /* #define CFG_NO_FLASH                1 */    /* Flash is not usable now      */
-#define CFG_ENV_IS_NOWHERE     1       /* Store ENV in memory only     */
+#define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only     */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE           0x2000
 #endif

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index a8e7c0a416c7a6ab0c6ac99ad13835ef5e5df9da..f661c8e3b4496c59797edaa2fac4683af805d3d5 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -418,7 +418,7 @@
   #define CFG_ENV_SIZE         0x2000
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 7c695828045d6188c3cfc532ec5cd42bff76425b..2ee8d57015f2cbc0a8fee8002c7025d25c2731c4 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -443,7 +443,7 @@
 #define CFG_ENV_SECT_SIZE      0x20000 /* 126k (one sector) for env */
 #define CFG_ENV_SIZE           0x2000
 #else
-#define CFG_ENV_IS_NOWHERE     1       /* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE           0x2000
 #endif

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index a57c30331bdf2316d8a66017ff6adf4dcafe99b4..170fbd6a5caf222eabeb91a9f48208bf292b9fb6 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -509,7 +509,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
     #define CFG_ENV_SECT_SIZE          0x10000 /* 64K(one sector) for env */
     #define CFG_ENV_SIZE               0x2000
 #else
-    #define CFG_ENV_IS_NOWHERE 1       /* Store ENV in memory only */
+    #define CONFIG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
     #define CFG_ENV_ADDR               (CFG_MONITOR_BASE - 0x1000)
     #define CFG_ENV_SIZE               0x2000
 #endif

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index aa6095fa0f91b4e37dd7be4c7b6b2ed37845fb3c..1212bcdb7c2ce7a015a260f9a500bd2c3b00f070 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -299,7 +299,7 @@
   #define CFG_ENV_SIZE         0x2000
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 244f09aa95f86e7e194b637f08ec6acda94ba305..75dba3bcb1fe78a02e0bde01b1b426a90253fbcf 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -299,7 +299,7 @@
   #define CFG_ENV_SIZE         0x2000
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index da7d8b82b13198524f999948c0cb3dc45872d0b3..074e8a1a98e44db360533245eb616c296750bded 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -160,7 +160,7 @@
 
 #define CFG_NO_FLASH           1               /* There is no FLASH memory     */
 
-#define CFG_ENV_IS_NOWHERE     1               /* Store ENV in memory only     */
+#define CONFIG_ENV_IS_NOWHERE  1               /* Store ENV in memory only     */
 #define CFG_ENV_OFFSET         0x00004000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
 

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 93509ee087384bd7d7578b751da9efe93a9715c3..6b25d56fcbd01a9a33e99380c7a2bf39a0a6e6d7 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -333,7 +333,7 @@
 /* Environment */
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
-    #define CFG_ENV_IS_NOWHERE
+    #define CONFIG_ENV_IS_NOWHERE
     #define CFG_ENV_ADDR       (CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE       0x2000
   #else
@@ -344,7 +344,7 @@
   #endif
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only     */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index e8f69f6dc86f55ccfca771ae451a8d17b209869f..2ab6991513a0a97498162c0b101d39cf9beeffd6 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -306,7 +306,7 @@ extern int tqm834x_num_flash_banks;
        #define CFG_ENV_SIZE            0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index ae40b358e951e06c80c5c69069a26a409ff7b73f..85f45b7e06e0e7048e8e645c7e53e986a27c14d3 100644 (file)
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -52,7 +52,7 @@
 /*
  * select serial console configuration
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define        CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200

diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index c1dd33d1d25bb431e002430f1aa45cfc729205f3..f34dc5c97247d4914ac0a6f45b4cce1ec13cbe89 100644 (file)
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -52,7 +52,7 @@
 /*
  * select serial console configuration
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define        CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 8941c5eb12a6fc4aa79459e52393b6edb5d76acb..d422cce202dd369cf96c4a01a9e070b74b57c49b 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -198,7 +198,7 @@
 #define CFG_FLASH_ERASE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_NOWHERE      1
+#define        CONFIG_ENV_IS_NOWHERE   1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           0xB0030000

diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 1571477d0277a6ea4cd1c374048b133e347a3482..f2ed0df494d99e187735015091e7f28252bb6047 100644 (file)
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -172,7 +172,7 @@
 
 /* environment settings */
 #define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x20000) /* environment start address */
 #define CFG_ENV_SECT_SIZE      0x10000    /* Total Size of Environment Sector */

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 942609f8caf27d08a4e41addf7aad7f4fc6111d8..7fee1d2dfc11b10fdc6822c971a35c2aec4152ac 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -218,7 +218,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH    1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE           0x8000

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index ae25fb291e0d285b809734521447b7691388368a..776fe40dec1b2479a882f03314846ab7e31ac069 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -206,7 +206,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH    1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE           0x8000

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index f019bb44eabd71729bb55274d0b2292747ad94de..f0f770cb3fe716fab5e689e75a1577c0c57f3da5 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -182,7 +182,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH    1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE           0x8000

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f880a7b51985e496e2745bd9d32135d0f83e406b..c6d366607f032bd52e688b34a39d700a2b9a810d 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -209,7 +209,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
 /*#define CFG_ENV_IS_IN_FLASH  0*/
 /*#define CFG_ENV_SIZE         0x8000*/
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index e5af9a6e97ffcb5d6e0b1e5906f7db2e242fbf84..945a163fb1b7ad91f8af5affb45c530e5deb8218 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -206,7 +206,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
 /*#define CFG_ENV_IS_IN_FLASH  0*/
 /*#define CFG_ENV_SIZE         0x8000*/
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 7f7190bcdb4d51f13d2a8b69fcbe905289fa698e..ad8bb5958042d1ce29bc8d9ff3c4b7a26b94d901 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -153,7 +153,7 @@
 #define CFG_FLASH_ERASE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_NOWHERE     1
+#define CONFIG_ENV_IS_NOWHERE  1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           0xB0030000

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 0dd9787822afe1a54317c3fc5825beffe1b1f1a6..7f262cbf91839331fba3d486214fe85235ee8a0e 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -123,7 +123,7 @@
 
 #undef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 0796a7d52676693d6fa19b4c7fc2cd554defc90c..af0f7f4758ea135f13f2ced9e8a2e5bd0b6adb03 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -109,7 +109,7 @@
 #undef CONFIG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM and bootstrap configuration */

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index ba3c5315e9fed35921201a3b45896145eb1e5d06..dd070be13b5c12d9bbf1e5e159b4a5bbd678ef23 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -128,7 +128,7 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_MAX_FLASH_BANKS    1               /* max number of memory banks */
 #define PHYS_FLASH_SIZE                0x01000000      /* 16MB */
 /* timeout values are in ticks */

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 5c234df932d1e9706fcba661f42a4f0f95ab855f..35ecc656b931cf3b2534f4d3b864fabf5e9ad029 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -123,7 +123,7 @@
 
 #undef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 36a42ba6fc25509724ca2f518e8aa92eb8b9d557..c626702dd32a710e75582d9c640eca8e3e6fdb50 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -161,7 +161,7 @@
        #define CFG_FLASH_PROTECTION            /* hardware flash protection */
 
        #ifdef  RAMENV
-               #define CFG_ENV_IS_NOWHERE      1
+               #define CONFIG_ENV_IS_NOWHERE   1
                #define CFG_ENV_SIZE            0x1000
                #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
@@ -174,7 +174,7 @@
 #else /* !FLASH */
        /* ENV in RAM */
        #define CFG_NO_FLASH            1
-       #define CFG_ENV_IS_NOWHERE      1
+       #define CONFIG_ENV_IS_NOWHERE   1
        #define CFG_ENV_SIZE            0x1000
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
        #define CFG_FLASH_PROTECTION            /* hardware flash protection */

diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 5159897db382a1f97225262ad4f6dd61cb6e6e12..84540f5e546d76cfce3c8e8f41040add5de7243d 100644 (file)
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -171,7 +171,7 @@
 
 /* environment settings */
 #define        CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR           0x1001C000 /* environment start address */
 #define CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */

diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index 746a56e9aa36814bcf8f728886e20913738075b6..b9eec62cfa44fac3f6f45d4c47b7494353be8a76 100644 (file)
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -186,7 +186,7 @@
 
 /* @TODO */
 /*#define      CFG_ENV_IS_IN_FLASH     1*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
 
 #ifdef CONFIG_STATUS_LED

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 2caa64173c8bd30effe6d2411c1a712cfe11f0e3..4ec520fef386a057135893393e481936935b8c83 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -116,7 +116,7 @@
 #define CFG_FLASH_ERASE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_NOWHERE      1
+#define        CONFIG_ENV_IS_NOWHERE   1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           0xB0030000

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 261229c489c5b061b0df6d795ef12161c3cdace9..264f5ab1d9753803782d89dfb3eb06f1a0b70257 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -424,7 +424,7 @@
 
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 99d328c7557efce126fc433ac649537772065969..f39867febc5ee852310d63328aa182d73d278144 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -332,7 +332,7 @@
 /* Environment */
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
-    #define CFG_ENV_IS_NOWHERE
+    #define CONFIG_ENV_IS_NOWHERE
     #define CFG_ENV_ADDR       (CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE       0x2000
   #else
@@ -343,7 +343,7 @@
   #endif
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only     */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index ea79de71f36bc9fbffc0f29a728ab5e9269dfcba..f4a8fa577d2ae9bbf4f42d312af1286a40e55475 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -294,7 +294,7 @@
   #define CFG_ENV_SIZE         0x2000
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
-  #define CFG_ENV_IS_NOWHERE   1       /* Store ENV in memory only     */
+  #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000
 #endif

diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index 020ed02304de2701e6bfce6f6777520d81f7838f..5299733e07919ff8df163c2dd44cf23129e88e93 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -90,7 +90,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_NOWHERE     1
+#define CONFIG_ENV_IS_NOWHERE  1
 #define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sector total size   */
 

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index c18a248147ea789fcee62361d24767019cc601be..f563c580c2092268c12ab1205cda5c1fadfb39b2 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -185,7 +185,7 @@
 
 #define PHYS_FLASH_1           (CFG_FLASH_BASE)
 
-#define CFG_ENV_IS_IN_FLASH     1               /* env in flash instead of CFG_ENV_IS_NOWHERE */
+#define CFG_ENV_IS_IN_FLASH     1               /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
 #define CFG_ENV_SECT_SIZE       0x00020000      /* 256 KB sectors (x2) */
 #define CFG_ENV_SIZE            0x10000         /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET          0x01f00000      /* environment starts here  */

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 570d6a8021c746b6ba5561ea51fd94126fddaf0d..7bd142469db76459659095e63235bb11bd66b139 100644 (file)
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -150,7 +150,7 @@
 #define        CFG_INIT_SP_OFFSET      CFG_MALLOC_BASE
 
 #define        CFG_NO_FLASH            1
-#define        CFG_ENV_IS_NOWHERE      1
+#define        CONFIG_ENV_IS_NOWHERE   1
 #define        CFG_ENV_SIZE            0x1000
 #define        CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
 

diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index d6423d4f3f91b5316507a22e4735e7cb42781cbe..f3d0c52270fd7e3b0db48637ed92401add2a6a14 100644 (file)
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -261,7 +261,7 @@ void board_init_f(ulong board_type)
 void board_init_r(gd_t *new_gd, ulong dest_addr)
 {
        extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
        char *s;
@@ -302,7 +302,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        }
 
        /* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        env_name_spec += gd->reloc_off;
 #endif
 

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 3aadfaffb2e53f6cc43ddd5ace1549e53380aad4..428a241b73445290944f92c10be0c3f6a76de3a3 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -443,7 +443,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        int i;
        extern void malloc_bin_reloc (void);
 
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
 #ifndef CFG_NO_FLASH
@@ -494,7 +494,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
        }
        /* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        env_name_spec += gd->reloc_off;
 #endif
 

diff --git a/lib_mips/board.c b/lib_mips/board.c
index 64ca2003f332028d6d7f266c5ad81b529da7fb0a..fb31e33f38f9c4c8acec7c762a9d44fbb4dc0701 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -308,7 +308,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        ulong size;
 #endif
        extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
        char *s, *e;
@@ -353,7 +353,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
        }
        /* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        env_name_spec += gd->reloc_off;
 #endif
 

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index a757ffd247a48553bb48fd984fa91225cbcf3271..cf6239f9c01ab1e840be002f8732b2dd97119dcb 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -651,7 +651,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        bd_t *bd;
        int i;
        extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
 
@@ -713,7 +713,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
        }
        /* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        env_name_spec += gd->reloc_off;
 #endif