rename CONFIG_CMD_ENV to CONFIG_CMD_SAVEENV

The CONFIG_CMD_ENV option controls enablement of the `saveenv` command
rather than a generic "env" command, or anything else related to the
environment.  So, let's make sure the define is named accordingly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/README b/README
index b23a51258ed75bed57a114b71851b0d728f18547..b64c1596d116ec6cc0b60172a6744b260db92bbd 100644 (file)
--- a/README
+++ b/README
@@ -608,7 +608,7 @@ The following options need to be configured:
                CONFIG_CMD_ECHO           echo arguments
                CONFIG_CMD_EEPROM       * EEPROM read/write support
                CONFIG_CMD_ELF          * bootelf, bootvx
-               CONFIG_CMD_ENV            saveenv
+               CONFIG_CMD_SAVEENV        saveenv
                CONFIG_CMD_FDC          * Floppy Disk Support
                CONFIG_CMD_FAT          * FAT partition support
                CONFIG_CMD_FDOS         * Dos diskette Support

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 1fcb4c96af3e0f41c46a04a84fe6f8020e8d738d..02b18ec327b797cea2044020c77f11443a96af32 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -546,7 +546,7 @@ int getenv_r (char *name, char *buf, unsigned len)
        return (-1);
 }
 
-#if defined(CONFIG_CMD_ENV) && !defined(CONFIG_ENV_IS_NOWHERE)
+#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
 
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {

diff --git a/common/env_flash.c b/common/env_flash.c
index 75ee8ddc89ee6d761d2c6b25b8f02430529446cc..00792cd38cf4311e9a549846d4da2ba8382e5a67 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -34,10 +34,10 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
+#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
 #define CMD_SAVEENV
 #elif defined(CONFIG_ENV_ADDR_REDUND)
-#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
+#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
 #endif
 
 #if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)

diff --git a/common/env_nand.c b/common/env_nand.c
index e490775ecf5af3fe49ac83780c5b83f8169a9c46..76569da0fef2169172e5977ebf4ac84bece3388c 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -39,10 +39,10 @@
 #include <malloc.h>
 #include <nand.h>
 
-#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND)
 #define CMD_SAVEENV
 #elif defined(CONFIG_ENV_OFFSET_REDUND)
-#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
+#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
 #endif
 
 #if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)

diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index d771696fe08dd2f44dd784a11cf7ac2344bc4c53..205dd1f6594049ae01145b88751f4a79c9fc6371 100644 (file)
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -33,7 +33,7 @@
 #define CONFIG_CMD_ECHO                /* echo arguments               */
 #define CONFIG_CMD_EEPROM      /* EEPROM read/write support    */
 #define CONFIG_CMD_ELF         /* ELF (VxWorks) load/boot cmd  */
-#define CONFIG_CMD_ENV         /* saveenv                      */
+#define CONFIG_CMD_SAVEENV     /* saveenv                      */
 #define CONFIG_CMD_EXT2                /* EXT2 Support                 */
 #define CONFIG_CMD_FAT         /* FAT support                  */
 #define CONFIG_CMD_FDC         /* Floppy Disk Support          */

diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h
index 4ad8f369fd372cfa0c9d72943cbb08b2c3ab1d66..366760289fb47135cfe0135c390d03d7d7859426 100644 (file)
--- a/include/config_cmd_default.h
+++ b/include/config_cmd_default.h
@@ -21,7 +21,7 @@
 #define CONFIG_CMD_BOOTD       /* bootd                        */
 #define CONFIG_CMD_CONSOLE     /* coninfo                      */
 #define CONFIG_CMD_ECHO                /* echo arguments               */
-#define CONFIG_CMD_ENV         /* saveenv                      */
+#define CONFIG_CMD_SAVEENV     /* saveenv                      */
 #define CONFIG_CMD_FLASH       /* flinfo, erase, protect       */
 #define CONFIG_CMD_FPGA                /* FPGA configuration Support   */
 #define CONFIG_CMD_IMI         /* iminfo                       */

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index f1608e145f5576d5fceced18abcef6dcda7d72f9..527c84650209cd64f8934d27af8892f8860644ac 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -86,7 +86,7 @@
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_NET
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_ECHO

diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h
index 63a0d3d6a1a38003b101f4b6d8820dfa6b710c9d..53bd0d87c924ea0f2bd1ae053370c624e6c8c01a 100644 (file)
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -170,7 +170,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IRQ

diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h
index 36e1f81739e6c8c3e71d2cd5f48c75d8ddc46589..9e9a8a4ab0840e2c98c0cba251eaf57a6d7da3d1 100644 (file)
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -170,7 +170,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IRQ

diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index 1b766a7dcbaeb29b01ee53723237012c12f088b5..201e62aa04d70e6cd3090f7832e7e414b559fcd5 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -114,7 +114,7 @@
 
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 
 

diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h
index 1ef80679635fdfdf70ac225472c93a2ed1e39bec..d8312384df3de59adee112ade597980a8701dbb0 100644 (file)
--- a/include/configs/FLAGADM.h
+++ b/include/configs/FLAGADM.h
@@ -83,7 +83,7 @@
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_LOADB
 #define CONFIG_CMD_LOADS
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_NET

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 58a26e117e32f96172cf6c6a2c12d1abf3063bdb..0ef4ebaec7681a12764cb7fa5074a2b62bde1f6a 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -430,7 +430,7 @@
 #define CONFIG_CMD_PCI
 
 #if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND_U_BOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index a04868ec67d4a61db1a884a42899ea6e2443e754..9fa91f4f6d53027e1a021ff306a709d8737a0e76 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -434,7 +434,7 @@
 #define CONFIG_CMD_PCI
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index c6ac91a536c37e3bf966e7564befb99ea2942fa7..4eab2857127ef4fd7a16cb1107cca5a3d1b7f3ec 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -427,7 +427,7 @@
        #define CONFIG_CMD_PCI
 #endif
 #if defined(CONFIG_SYS_RAMBOOT)
-       #undef CONFIG_CMD_ENV
+       #undef CONFIG_CMD_SAVEENV
        #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index ad8ea89ef7387cbd77ba1e2e380845ea845d9774..ea1928eae97aba2d4062416fdc83dfc6eb5dd2bd 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -441,7 +441,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 8e82aac7b7ac7c215b30897a8f71dd806e460146..b3c0e2dd5c1db82754951eab6d600b00634b0f92 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -509,7 +509,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index fbd2457aafa0e2014c13d8c5bb8432addf5c956b..bdd6b87ad3a50ddde7cf96a2c150e4a55969d660 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -470,7 +470,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index c20f86aa235791c6b24c540b6d0a034b3b5e3c60..f7ebdaad7282c169f9e3da78bdaae288f35ac267 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -376,7 +376,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 75b67b459074634933460ff40af1d6c3e492135a..a62d805a9ae13e2c45779e25fcf033793cb0276c 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -497,7 +497,7 @@ extern int board_pci_host_broken(void);
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index f281c59d3c3b5fec1556e7d919179877c0d51d4d..2e31dd00a8ebbc608437dd187e1785b48014ae67 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -481,7 +481,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 0d03b0b85f8595d4b6a1ce324560bba435d31317..4aaad55b53e45a0b4c6557de9e972edf53a6e490 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -423,7 +423,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 5ac1916cbd710d7e7636a4ce5a0bd789df606c1c..95ea27583986588795ca21380ba90a864a4284c8 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -300,7 +300,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_RAM_AS_FLASH)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 3f78a6e120a098b56449147408eff746e9b2e1f2..a41f50a1736ea8fa861c8bde118a5baab167fd4a 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -457,7 +457,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 7a9e57fdc57a91f86dd618c6ef40b41fcfa50113..1091043c0122a5cee740408dbe134745bbb3a52b 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -489,7 +489,7 @@
 #define CONFIG_CMD_MII
 
 #if defined(CONFIG_SYS_RAMBOOT)
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #endif
 
 #if defined(CONFIG_PCI)

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 9a1b84756c8aee9c77265d182f180170305fdcb9..9d661010d30aee92e85aa5582b075be9d071ec55 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -649,7 +649,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
 #endif
 
 #if defined(CONFIG_PCI)

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 31b9f038b52379db2241b472deba48bd778a8553..79c20696faa2bf91f66d7c909ca075510780c915 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -85,7 +85,7 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IRQ

diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index b0361279788978b82dcf3d8e15da0cce208845bc..10210f040051ce5e1c2aef8fd0230a3dbe79162c 100644 (file)
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -92,7 +92,7 @@
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_RUN
 

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index e171f76b5a9835431e7cc56b70f5a3bb20cac12f..c9589bd87667529f8f68806cbd22aecad4ac3cab 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -40,7 +40,7 @@
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTDELAY       3

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 9d80ce41324fbda6a9f7c74d3fe31b7f343dca5d..88e95289528ba868b153ee6555e3a55025c448d4 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -57,7 +57,7 @@
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_LOADS
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE

diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 481e3354be4d1d0dd78617f3bb5cc9b0737246fd..831a60d9a067f669b84741d7e235a442dbb6f1ad 100644 (file)
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -137,7 +137,7 @@
  */
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IRQ

diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index 5b1fcff9c2c6171740386d234d1882710f67c13b..522349f7886901804ee85d0392634445883766cc 100644 (file)
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -177,7 +177,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IRQ

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 41e290d0b13000962eb434b32038d77ecaac2ab1..3f943aa437b6957414ae26a74e9cb58a15fb6c68 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -331,7 +331,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 6b4e2dd42d404f3a7774b1798653cc0e23f3592c..43c2873e3700575f7fb2b67142d00015de81fa45 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -330,7 +330,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 2c0774fea03ee6606834f161dbf252161a9a2e77..06c11e69ba1d9524c58f5b2295306e04b8164c00 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -61,7 +61,7 @@
 
 #undef CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_IMLS
 

diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index 4ac31b1c0a192608a8f28962fc9776740b46ce89..c1416cb91bdde03916fcb46c26a852d4aa80b166 100644 (file)
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -211,7 +211,7 @@
 #define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IMMAP

diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index 65f41e6a70f0c62e6f807d3a8cfa1942eb6cefab..de74fee768140672c9864dd54d5b445150182a98 100644 (file)
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -211,7 +211,7 @@
 #define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IMMAP

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 34196319c5a48404746cec872640c90886165a58..7239f8409de5db4b3555eb6fad0704e09338f750 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -382,7 +382,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index a616236b77083ccdbf079ffca55e7b6ccba251ba..f62a7051958f77f55b54962225100776319fb76a 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -332,7 +332,7 @@
 #define CONFIG_CMD_JFFS2
 
 #if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND_U_BOOT)
-       #undef CONFIG_CMD_ENV
+       #undef CONFIG_CMD_SAVEENV
        #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index d4154d205086136ce9530774016acc0bd6214283..4181a400e881bdf6b80d7b340d961a6e0c7c87aa 100644 (file)
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -67,7 +67,7 @@
 
 #define CONFIG_CMD_IDE
 
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FLASH
 
 

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 796030d0607e7685fbb5c94d33eb539ed84ddef4..e126dc38cb1ffb3e87ce4ead2507688bbd342d91 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -340,7 +340,7 @@ extern int tqm834x_num_flash_banks;
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index 982f8d8010d96f55dda51e4b57d0a7cc3fffb723..5f9a17f3df83e0dfbaf845e1cf7208ba8e5a4185 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -154,7 +154,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IMLS

diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h
index 1df6855ccaf67f4b4e4fb5911f8f07feef92a3be..370aae1c4c692eecb39bd5b2416365e46ee1c97e 100644 (file)
--- a/include/configs/XPEDITE5200.h
+++ b/include/configs/XPEDITE5200.h
@@ -330,7 +330,7 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2

diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h
index 3bc0fe8f67639be9551508e52182946de6556d23..a353a14e7dd72523d2bae3df07e984eb16c22b4c 100644 (file)
--- a/include/configs/XPEDITE5370.h
+++ b/include/configs/XPEDITE5370.h
@@ -375,7 +375,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 9134ad1dc4037e030f565fc85c05e5963d6bf252..c6d77e3ae6b4becddf26cedfb4f6031d86b9fa6f 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -40,7 +40,7 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION

diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index cfe6de79f424885eb06a724d5f25f52998697fc2..ce36a242614d818dc2dff21b6c97a6bb84c8d9c7 100644 (file)
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -73,7 +73,7 @@
  */
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 
 
 #define CONFIG_BOOTDELAY       0

diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 5454c2e5bdb608e56b9c5648f8736795495ffc3b..02cb1efd0fe3857fe9ffa06706cb073d42a276cf 100644 (file)
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -73,7 +73,7 @@
  */
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 
 
 #define CONFIG_BOOTDELAY       0

diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index fa70a09f6aecd1831ce50fd4834cbf11e06e673d..c3c603b42deac22b7ecdf21791ef1d9bd2c26f0b 100644 (file)
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -69,7 +69,7 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_IMI
 

diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index a24e34a5089634fac82b7e2f863879e6dbeb3a8b..15635288e38d254da55ca9c7c2b2dd42f7e12683 100644 (file)
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -78,7 +78,7 @@
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_NET
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_ECHO

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index a578038b541f4075f542a06cc62bc8a1468507d3..b439c80d4ff44968df436c2879f956c2da8ba6c6 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -97,7 +97,7 @@
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_BEDBUG
 #undef CONFIG_CMD_ELF
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_MII

diff --git a/include/configs/delta.h b/include/configs/delta.h
index abb2676bcc2ea4d234243ab0ea3535b222b6b33d..8cbeb9a5e200ca59bfadc682b970279ce81c58fc 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -108,7 +108,7 @@
 
 #else
 
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_I2C
 

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index 8f9e972453b458551e2292f322124c908ef99636..447c7bc87aa9408bd8046a2903ecc3b212c63bdc 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -75,7 +75,7 @@
 #define CONFIG_CMD_BOOTD       /* bootd                        */
 #define CONFIG_CMD_CONSOLE     /* coninfo                      */
 #define CONFIG_CMD_ECHO                /* echo arguments               */
-#define CONFIG_CMD_ENV         /* saveenv                      */
+#define CONFIG_CMD_SAVEENV     /* saveenv                      */
 #define CONFIG_CMD_FLASH       /* flinfo, erase, protect       */
 #define CONFIG_CMD_FPGA                /* FPGA configuration Support   */
 #define CONFIG_CMD_IMI         /* iminfo                       */

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index fc3174c63f3888a0c0a44e0bcda1d86274e927a2..85bf236c6437e88c8e6f1aacb963dda8e17bd15c 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -77,7 +77,7 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_PCI
 
 

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index aeede046655503616899f5b6a2eced7ed8f56537..b1b4842e085b1ae08334cdb6d68242ca5734c8e6 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -90,7 +90,7 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_DHCP
 
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_FPGA

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 1b05b8058a51e9f3031961c0a669f6c4daad1944..45e22bfc4902b059a6f5db16b778520f42852f8a 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -73,7 +73,7 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IMI

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 1a70af620c6e07e8e2d27992a866d8c4547995d3..5b4747a575becce9239eed862e998857d58f2f86 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -85,7 +85,7 @@
  */
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_MEMORY

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 25b1c172e6c7367441f102df6bd59b75fff0c73e..b86c61d5ffe2517fa6f36fecbf57890ae95e8e35 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -305,7 +305,7 @@
 #endif
 
 #if defined(CFG_RAMBOOT)
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index bb6f943aebb3475905a54ae4ceb5b00fdbf4fa2f..8644cb08a66b072d1302d62dff3e276a056769f3 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -69,7 +69,7 @@
  */
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_RUN

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index eab37df22dd0f305e8a4fc21f28b12a142b8da5f..a432850519bff6ae4a012dfa750633605bce9a1e 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -154,7 +154,7 @@
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_AUTO_COMPLETE

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 4c6cc9fef08d4b8e7427e96efd0d0ad8c409ba59..ac18c8776dd68695bad2c93fc01f55a0f19dca95 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -248,7 +248,7 @@
        #define CONFIG_CMD_JFFS2
 
        #if !defined(RAMENV)
-               #define CONFIG_CMD_ENV
+               #define CONFIG_CMD_SAVEENV
                #define CONFIG_CMD_SAVES
        #endif
 #else

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 483bc5305cc01dcb13b6110bb0c757a271f5c776..a1783b200942b007ff4b37501519a0b238521d56 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -163,7 +163,7 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 6ebb1e17b5d7a61cca849171cb869aca2fbc0c3c..86f6a934f9f1fb8905704774ee0775accfd6912a 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -27,7 +27,7 @@
 #define __MPR2_H
 
 /* Supported commands */
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_FLASH

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 520bac074994cee5dafcbb43737b950055d393d8..9a88ec7fa4cea42271303d61ce1037f3a2d48d7d 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -31,7 +31,7 @@
 #define CONFIG_MS7720SE                1
 
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_CACHE

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 52020047d9ef50142d1564e1bc10e497cbfbfc14..53ffbeef240fd176c828ac8979cbe3216388aecf 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -38,7 +38,7 @@
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTDELAY       3

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index af9933cad9c3874370ba90e61fe718445febecf1..5eed3ab66db1463511dc3737d02c4cfc01946a90 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -40,7 +40,7 @@
 
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_BAUDRATE                38400

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index fab22d16a745fd0642690bb27382a7014a13a302..2c90265e3b4c9f1be9f6bc71ae2ef85dfa06039d 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -140,7 +140,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_JFFS2

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 7c7bebac3b1d2f3252c99d8c129d64bc8c5a7e96..5ad745e646b363846e3584fc3112ac3e07a93f27 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -198,7 +198,7 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_FPGA

diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 577ab8ef6f70abd2f2529b93532f0ae62e30cc67..0fd86356814e0c5c3bca942084457e8144d5d05d 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -83,7 +83,7 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_NET

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index f85d5d66959d3a9a36ba7e5addf02a45826c34aa..72a3b5c8b1f22b927b00e484b699bf68ff987190 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -43,7 +43,7 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_EXT2

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index f88a7734039ec4fcf34a2f897dc8533d70877c28..36e4c017bbe716aee75c9ed0f9941dcf83b3b1dd 100644 (file)
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -37,7 +37,7 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_CACHE

diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h
index d19a787e9283123b864f3ac2ddfb797283c0926b..1cc2920b37371a8bc59758308355cc86e206da81 100644 (file)
--- a/include/configs/sbc8240.h
+++ b/include/configs/sbc8240.h
@@ -96,7 +96,7 @@
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 0603e3c8a4b462aef464c519e27be44ec1ec460a..f476e3ed5e690eae28d56de937f415d3689877fa 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -455,7 +455,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index d4e9d7479ab42075d246c2efebfea03a7f5f8cbe..4fa501da5ebe88bffda14cc99035ecbdb736b947 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -380,7 +380,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_RAM_AS_FLASH)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif
 

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 4ea79cf33b3be301f0d78338c68ae8099f398d32..8d7456eb69983ed2476ab274c98ce2ee1c223a1e 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -40,7 +40,7 @@
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_JFFS2
 

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index ebca448eafddd4dee35abd7d5be730df8ce680f6..537ec4ecadce12fbb234d787181a65069cb89549 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -40,7 +40,7 @@
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_RUN
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index c61667fd0c190a0876f5896064ac4eacffcbe75d..06d6a885920e6202e7279f1121a7f8d5e0174b66 100644 (file)
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -104,7 +104,7 @@
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_LOADS
 #define CONFIG_CMD_LOADB
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_NAND
 #if defined(CONFIG_BOOT_ONENAND)
 #define CONFIG_CMD_ONENAND

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index ae6f45aeecde44f4febaf438ee6c69ee07cd8005..0424e2978e34e64b9cf19aff3d8d417f13019617 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -322,7 +322,7 @@
 #define CONFIG_CMD_I2C
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #else
     #define CONFIG_CMD_ELF

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index c312f1af9dd061d625599bfb7170377dfd527359..2783f9e04ea0c9e63044e50320c798ad4777b4d3 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -363,7 +363,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #else
     #define CONFIG_CMD_ELF

diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index b702de0c58553455bedb62f8f97e07032e8924bb..353e8db4270528fa74ccc353830d2f0cf9e44e75 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -62,7 +62,7 @@
 #include <config_cmd_default.h>
 
 #undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_MEMORY
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_MISC

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 6e9c27c1e1b3d43bd1c58b7d2c8dada4f8d48b45..1a47aadcfca3e8804f6d3376d1aa081b5d1fb869 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -105,7 +105,7 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_LOADS
 #define CONFIG_CMD_LOADB

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index d8124216540ca4d9fd629c7535afa7b3da526031..852becb36dcdad4a4e6bd87480b1a38f4038edfa 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -108,7 +108,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 
 /*

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 866b72d4cf25d447416a92bd88529509bc69881d..f4606102a99d881853bc480e6bf900611e69ac9e 100644 (file)
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -127,7 +127,7 @@
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_JFFS2

diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index f30eca1d248ce3efd5256a3913a73be6044933fb..31ea4ca3171cd8663e89688d4ef29259e41743e0 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -94,7 +94,7 @@
 #ifdef TURN_ON_ETHERNET
     #define CONFIG_CMD_PING
 #else
-    #define CONFIG_CMD_ENV
+    #define CONFIG_CMD_SAVEENV
     #define CONFIG_CMD_NAND
 
     #undef CONFIG_CMD_NET