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>
16 years ago · bdab39d358
parent 8b0592b89e
commit bdab39d358
82 changed files with 84 additions and 84 deletions
--- a/2
+++ b/2
@ -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
--- 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[])
 {
--- 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)
--- 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)
--- 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		*/
--- 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			*/
--- 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
--- 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
--- 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
--- 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


--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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)
--- 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)
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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

--- 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


--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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

--- 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			*/
--- 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


--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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


 /*
--- 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
--- 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