Commit bdab39d358e63aa47f400a8a76b8d5f283842df3

Authored by Mike Frysinger
Committed by Wolfgang Denk
1 parent 8b0592b89e

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>

Showing 82 changed files with 84 additions and 84 deletions Side-by-side Diff

... ... @@ -608,7 +608,7 @@
608 608 CONFIG_CMD_ECHO echo arguments
609 609 CONFIG_CMD_EEPROM * EEPROM read/write support
610 610 CONFIG_CMD_ELF * bootelf, bootvx
611   - CONFIG_CMD_ENV saveenv
  611 + CONFIG_CMD_SAVEENV saveenv
612 612 CONFIG_CMD_FDC * Floppy Disk Support
613 613 CONFIG_CMD_FAT * FAT partition support
614 614 CONFIG_CMD_FDOS * Dos diskette Support
... ... @@ -546,7 +546,7 @@
546 546 return (-1);
547 547 }
548 548  
549   -#if defined(CONFIG_CMD_ENV) && !defined(CONFIG_ENV_IS_NOWHERE)
  549 +#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
550 550  
551 551 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
552 552 {
... ... @@ -34,10 +34,10 @@
34 34  
35 35 DECLARE_GLOBAL_DATA_PTR;
36 36  
37   -#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
  37 +#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
38 38 #define CMD_SAVEENV
39 39 #elif defined(CONFIG_ENV_ADDR_REDUND)
40   -#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
  40 +#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
41 41 #endif
42 42  
43 43 #if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
... ... @@ -39,10 +39,10 @@
39 39 #include <malloc.h>
40 40 #include <nand.h>
41 41  
42   -#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
  42 +#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND)
43 43 #define CMD_SAVEENV
44 44 #elif defined(CONFIG_ENV_OFFSET_REDUND)
45   -#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
  45 +#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
46 46 #endif
47 47  
48 48 #if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
include/config_cmd_all.h
... ... @@ -33,7 +33,7 @@
33 33 #define CONFIG_CMD_ECHO /* echo arguments */
34 34 #define CONFIG_CMD_EEPROM /* EEPROM read/write support */
35 35 #define CONFIG_CMD_ELF /* ELF (VxWorks) load/boot cmd */
36   -#define CONFIG_CMD_ENV /* saveenv */
  36 +#define CONFIG_CMD_SAVEENV /* saveenv */
37 37 #define CONFIG_CMD_EXT2 /* EXT2 Support */
38 38 #define CONFIG_CMD_FAT /* FAT support */
39 39 #define CONFIG_CMD_FDC /* Floppy Disk Support */
include/config_cmd_default.h
... ... @@ -21,7 +21,7 @@
21 21 #define CONFIG_CMD_BOOTD /* bootd */
22 22 #define CONFIG_CMD_CONSOLE /* coninfo */
23 23 #define CONFIG_CMD_ECHO /* echo arguments */
24   -#define CONFIG_CMD_ENV /* saveenv */
  24 +#define CONFIG_CMD_SAVEENV /* saveenv */
25 25 #define CONFIG_CMD_FLASH /* flinfo, erase, protect */
26 26 #define CONFIG_CMD_FPGA /* FPGA configuration Support */
27 27 #define CONFIG_CMD_IMI /* iminfo */
include/configs/CRAYL1.h
... ... @@ -86,7 +86,7 @@
86 86 #define CONFIG_CMD_FLASH
87 87 #define CONFIG_CMD_MEMORY
88 88 #define CONFIG_CMD_NET
89   -#define CONFIG_CMD_ENV
  89 +#define CONFIG_CMD_SAVEENV
90 90 #define CONFIG_CMD_CONSOLE
91 91 #define CONFIG_CMD_ASKENV
92 92 #define CONFIG_CMD_ECHO
include/configs/EP1S10.h
... ... @@ -170,7 +170,7 @@
170 170 #define CONFIG_CMD_BDI
171 171 #define CONFIG_CMD_DHCP
172 172 #define CONFIG_CMD_ECHO
173   -#define CONFIG_CMD_ENV
  173 +#define CONFIG_CMD_SAVEENV
174 174 #define CONFIG_CMD_FLASH
175 175 #define CONFIG_CMD_IMI
176 176 #define CONFIG_CMD_IRQ
include/configs/EP1S40.h
... ... @@ -170,7 +170,7 @@
170 170 #define CONFIG_CMD_BDI
171 171 #define CONFIG_CMD_DHCP
172 172 #define CONFIG_CMD_ECHO
173   -#define CONFIG_CMD_ENV
  173 +#define CONFIG_CMD_SAVEENV
174 174 #define CONFIG_CMD_FLASH
175 175 #define CONFIG_CMD_IMI
176 176 #define CONFIG_CMD_IRQ
include/configs/ERIC.h
... ... @@ -114,7 +114,7 @@
114 114  
115 115 #define CONFIG_CMD_PCI
116 116 #define CONFIG_CMD_IRQ
117   -#define CONFIG_CMD_ENV
  117 +#define CONFIG_CMD_SAVEENV
118 118 #define CONFIG_CMD_FLASH
119 119  
120 120  
include/configs/FLAGADM.h
... ... @@ -83,7 +83,7 @@
83 83 #define CONFIG_CMD_FLASH
84 84 #define CONFIG_CMD_LOADB
85 85 #define CONFIG_CMD_LOADS
86   -#define CONFIG_CMD_ENV
  86 +#define CONFIG_CMD_SAVEENV
87 87 #define CONFIG_CMD_REGINFO
88 88 #define CONFIG_CMD_IMMAP
89 89 #define CONFIG_CMD_NET
include/configs/MPC8313ERDB.h
... ... @@ -430,7 +430,7 @@
430 430 #define CONFIG_CMD_PCI
431 431  
432 432 #if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND_U_BOOT)
433   - #undef CONFIG_CMD_ENV
  433 + #undef CONFIG_CMD_SAVEENV
434 434 #undef CONFIG_CMD_LOADS
435 435 #endif
436 436  
include/configs/MPC8315ERDB.h
... ... @@ -434,7 +434,7 @@
434 434 #define CONFIG_CMD_PCI
435 435  
436 436 #if defined(CONFIG_SYS_RAMBOOT)
437   - #undef CONFIG_CMD_ENV
  437 + #undef CONFIG_CMD_SAVEENV
438 438 #undef CONFIG_CMD_LOADS
439 439 #endif
440 440  
include/configs/MPC8323ERDB.h
... ... @@ -427,7 +427,7 @@
427 427 #define CONFIG_CMD_PCI
428 428 #endif
429 429 #if defined(CONFIG_SYS_RAMBOOT)
430   - #undef CONFIG_CMD_ENV
  430 + #undef CONFIG_CMD_SAVEENV
431 431 #undef CONFIG_CMD_LOADS
432 432 #endif
433 433  
include/configs/MPC832XEMDS.h
... ... @@ -441,7 +441,7 @@
441 441 #endif
442 442  
443 443 #if defined(CONFIG_SYS_RAMBOOT)
444   - #undef CONFIG_CMD_ENV
  444 + #undef CONFIG_CMD_SAVEENV
445 445 #undef CONFIG_CMD_LOADS
446 446 #endif
447 447  
include/configs/MPC8349EMDS.h
... ... @@ -509,7 +509,7 @@
509 509 #endif
510 510  
511 511 #if defined(CONFIG_SYS_RAMBOOT)
512   - #undef CONFIG_CMD_ENV
  512 + #undef CONFIG_CMD_SAVEENV
513 513 #undef CONFIG_CMD_LOADS
514 514 #endif
515 515  
include/configs/MPC8360EMDS.h
... ... @@ -470,7 +470,7 @@
470 470 #endif
471 471  
472 472 #if defined(CONFIG_SYS_RAMBOOT)
473   - #undef CONFIG_CMD_ENV
  473 + #undef CONFIG_CMD_SAVEENV
474 474 #undef CONFIG_CMD_LOADS
475 475 #endif
476 476  
include/configs/MPC8360ERDK.h
... ... @@ -376,7 +376,7 @@
376 376 #endif
377 377  
378 378 #if defined(CONFIG_SYS_RAMBOOT)
379   -#undef CONFIG_CMD_ENV
  379 +#undef CONFIG_CMD_SAVEENV
380 380 #undef CONFIG_CMD_LOADS
381 381 #endif
382 382  
include/configs/MPC837XEMDS.h
... ... @@ -497,7 +497,7 @@
497 497 #endif
498 498  
499 499 #if defined(CONFIG_SYS_RAMBOOT)
500   - #undef CONFIG_CMD_ENV
  500 + #undef CONFIG_CMD_SAVEENV
501 501 #undef CONFIG_CMD_LOADS
502 502 #endif
503 503  
include/configs/MPC837XERDB.h
... ... @@ -481,7 +481,7 @@
481 481 #endif
482 482  
483 483 #if defined(CONFIG_SYS_RAMBOOT)
484   -#undef CONFIG_CMD_ENV
  484 +#undef CONFIG_CMD_SAVEENV
485 485 #undef CONFIG_CMD_LOADS
486 486 #endif
487 487  
include/configs/MPC8540ADS.h
... ... @@ -423,7 +423,7 @@
423 423 #endif
424 424  
425 425 #if defined(CONFIG_SYS_RAMBOOT)
426   - #undef CONFIG_CMD_ENV
  426 + #undef CONFIG_CMD_SAVEENV
427 427 #undef CONFIG_CMD_LOADS
428 428 #endif
429 429  
include/configs/MPC8540EVAL.h
... ... @@ -300,7 +300,7 @@
300 300 #endif
301 301  
302 302 #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_RAM_AS_FLASH)
303   - #undef CONFIG_CMD_ENV
  303 + #undef CONFIG_CMD_SAVEENV
304 304 #undef CONFIG_CMD_LOADS
305 305 #endif
306 306  
include/configs/MPC8560ADS.h
... ... @@ -457,7 +457,7 @@
457 457 #endif
458 458  
459 459 #if defined(CONFIG_SYS_RAMBOOT)
460   - #undef CONFIG_CMD_ENV
  460 + #undef CONFIG_CMD_SAVEENV
461 461 #undef CONFIG_CMD_LOADS
462 462 #endif
463 463  
include/configs/MPC8610HPCD.h
... ... @@ -489,7 +489,7 @@
489 489 #define CONFIG_CMD_MII
490 490  
491 491 #if defined(CONFIG_SYS_RAMBOOT)
492   -#undef CONFIG_CMD_ENV
  492 +#undef CONFIG_CMD_SAVEENV
493 493 #endif
494 494  
495 495 #if defined(CONFIG_PCI)
include/configs/MPC8641HPCN.h
... ... @@ -649,7 +649,7 @@
649 649 #define CONFIG_CMD_REGINFO
650 650  
651 651 #if defined(CONFIG_SYS_RAMBOOT)
652   - #undef CONFIG_CMD_ENV
  652 + #undef CONFIG_CMD_SAVEENV
653 653 #endif
654 654  
655 655 #if defined(CONFIG_PCI)
include/configs/MVBLUE.h
... ... @@ -85,7 +85,7 @@
85 85 #define CONFIG_CMD_CACHE
86 86 #define CONFIG_CMD_DHCP
87 87 #define CONFIG_CMD_ECHO
88   -#define CONFIG_CMD_ENV
  88 +#define CONFIG_CMD_SAVEENV
89 89 #define CONFIG_CMD_FLASH
90 90 #define CONFIG_CMD_IMI
91 91 #define CONFIG_CMD_IRQ
include/configs/MVS1.h
... ... @@ -92,7 +92,7 @@
92 92 #define CONFIG_CMD_MEMORY
93 93 #define CONFIG_CMD_NET
94 94 #define CONFIG_CMD_DHCP
95   -#define CONFIG_CMD_ENV
  95 +#define CONFIG_CMD_SAVEENV
96 96 #define CONFIG_CMD_BOOTD
97 97 #define CONFIG_CMD_RUN
98 98  
include/configs/MigoR.h
... ... @@ -40,7 +40,7 @@
40 40 #define CONFIG_CMD_NFS
41 41 #define CONFIG_CMD_DFL
42 42 #define CONFIG_CMD_SDRAM
43   -#define CONFIG_CMD_ENV
  43 +#define CONFIG_CMD_SAVEENV
44 44  
45 45 #define CONFIG_BAUDRATE 115200
46 46 #define CONFIG_BOOTDELAY 3
include/configs/PATI.h
... ... @@ -57,7 +57,7 @@
57 57 #define CONFIG_CMD_REGINFO
58 58 #define CONFIG_CMD_FLASH
59 59 #define CONFIG_CMD_LOADS
60   -#define CONFIG_CMD_ENV
  60 +#define CONFIG_CMD_SAVEENV
61 61 #define CONFIG_CMD_REGINFO
62 62 #define CONFIG_CMD_BDI
63 63 #define CONFIG_CMD_CONSOLE
include/configs/PCI5441.h
... ... @@ -137,7 +137,7 @@
137 137 */
138 138 #define CONFIG_CMD_BDI
139 139 #define CONFIG_CMD_ECHO
140   -#define CONFIG_CMD_ENV
  140 +#define CONFIG_CMD_SAVEENV
141 141 #define CONFIG_CMD_FLASH
142 142 #define CONFIG_CMD_IMI
143 143 #define CONFIG_CMD_IRQ
include/configs/PK1C20.h
... ... @@ -177,7 +177,7 @@
177 177 #define CONFIG_CMD_BDI
178 178 #define CONFIG_CMD_DHCP
179 179 #define CONFIG_CMD_ECHO
180   -#define CONFIG_CMD_ENV
  180 +#define CONFIG_CMD_SAVEENV
181 181 #define CONFIG_CMD_FLASH
182 182 #define CONFIG_CMD_IMI
183 183 #define CONFIG_CMD_IRQ
include/configs/PM854.h
... ... @@ -331,7 +331,7 @@
331 331 #endif
332 332  
333 333 #if defined(CONFIG_SYS_RAMBOOT)
334   - #undef CONFIG_CMD_ENV
  334 + #undef CONFIG_CMD_SAVEENV
335 335 #undef CONFIG_CMD_LOADS
336 336 #endif
337 337  
include/configs/PM856.h
... ... @@ -330,7 +330,7 @@
330 330 #endif
331 331  
332 332 #if defined(CONFIG_SYS_RAMBOOT)
333   - #undef CONFIG_CMD_ENV
  333 + #undef CONFIG_CMD_SAVEENV
334 334 #undef CONFIG_CMD_LOADS
335 335 #endif
336 336  
include/configs/PN62.h
... ... @@ -61,7 +61,7 @@
61 61  
62 62 #undef CONFIG_CMD_AUTOSCRIPT
63 63 #undef CONFIG_CMD_LOADS
64   -#undef CONFIG_CMD_ENV
  64 +#undef CONFIG_CMD_SAVEENV
65 65 #undef CONFIG_CMD_FLASH
66 66 #undef CONFIG_CMD_IMLS
67 67  
include/configs/QS823.h
... ... @@ -211,7 +211,7 @@
211 211 #define CONFIG_CMD_BOOTD
212 212 #define CONFIG_CMD_CONSOLE
213 213 #define CONFIG_CMD_DATE
214   -#define CONFIG_CMD_ENV
  214 +#define CONFIG_CMD_SAVEENV
215 215 #define CONFIG_CMD_FLASH
216 216 #define CONFIG_CMD_IMI
217 217 #define CONFIG_CMD_IMMAP
include/configs/QS850.h
... ... @@ -211,7 +211,7 @@
211 211 #define CONFIG_CMD_BOOTD
212 212 #define CONFIG_CMD_CONSOLE
213 213 #define CONFIG_CMD_DATE
214   -#define CONFIG_CMD_ENV
  214 +#define CONFIG_CMD_SAVEENV
215 215 #define CONFIG_CMD_FLASH
216 216 #define CONFIG_CMD_IMI
217 217 #define CONFIG_CMD_IMMAP
include/configs/SBC8540.h
... ... @@ -382,7 +382,7 @@
382 382 #endif
383 383  
384 384 #if defined(CONFIG_SYS_RAMBOOT)
385   - #undef CONFIG_CMD_ENV
  385 + #undef CONFIG_CMD_SAVEENV
386 386 #undef CONFIG_CMD_LOADS
387 387 #endif
388 388  
include/configs/SIMPC8313.h
... ... @@ -332,7 +332,7 @@
332 332 #define CONFIG_CMD_JFFS2
333 333  
334 334 #if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND_U_BOOT)
335   - #undef CONFIG_CMD_ENV
  335 + #undef CONFIG_CMD_SAVEENV
336 336 #undef CONFIG_CMD_LOADS
337 337 #endif
338 338  
include/configs/SPD823TS.h
... ... @@ -67,7 +67,7 @@
67 67  
68 68 #define CONFIG_CMD_IDE
69 69  
70   -#undef CONFIG_CMD_ENV
  70 +#undef CONFIG_CMD_SAVEENV
71 71 #undef CONFIG_CMD_FLASH
72 72  
73 73  
include/configs/TQM834x.h
... ... @@ -340,7 +340,7 @@
340 340 #endif
341 341  
342 342 #if defined(CONFIG_SYS_RAMBOOT)
343   - #undef CONFIG_CMD_ENV
  343 + #undef CONFIG_CMD_SAVEENV
344 344 #undef CONFIG_CMD_LOADS
345 345 #endif
346 346  
include/configs/VoVPN-GW.h
... ... @@ -154,7 +154,7 @@
154 154 #define CONFIG_CMD_BDI
155 155 #define CONFIG_CMD_CONSOLE
156 156 #define CONFIG_CMD_ECHO
157   -#define CONFIG_CMD_ENV
  157 +#define CONFIG_CMD_SAVEENV
158 158 #define CONFIG_CMD_FLASH
159 159 #define CONFIG_CMD_IMI
160 160 #define CONFIG_CMD_IMLS
include/configs/XPEDITE5200.h
... ... @@ -330,7 +330,7 @@
330 330 #define CONFIG_CMD_DHCP
331 331 #define CONFIG_CMD_EEPROM
332 332 #define CONFIG_CMD_ELF
333   -#define CONFIG_CMD_ENV
  333 +#define CONFIG_CMD_SAVEENV
334 334 #define CONFIG_CMD_FLASH
335 335 #define CONFIG_CMD_I2C
336 336 #define CONFIG_CMD_JFFS2
include/configs/XPEDITE5370.h
... ... @@ -375,7 +375,7 @@
375 375 #define CONFIG_CMD_DTT
376 376 #define CONFIG_CMD_EEPROM
377 377 #define CONFIG_CMD_ELF
378   -#define CONFIG_CMD_ENV
  378 +#define CONFIG_CMD_SAVEENV
379 379 #define CONFIG_CMD_FLASH
380 380 #define CONFIG_CMD_I2C
381 381 #define CONFIG_CMD_JFFS2
include/configs/ap325rxa.h
... ... @@ -40,7 +40,7 @@
40 40 #define CONFIG_CMD_PING
41 41 #define CONFIG_CMD_NFS
42 42 #define CONFIG_CMD_SDRAM
43   -#define CONFIG_CMD_ENV
  43 +#define CONFIG_CMD_SAVEENV
44 44 #define CONFIG_CMD_IDE
45 45 #define CONFIG_CMD_EXT2
46 46 #define CONFIG_DOS_PARTITION
include/configs/cm4008.h
... ... @@ -73,7 +73,7 @@
73 73 */
74 74 #include <config_cmd_default.h>
75 75  
76   -#undef CONFIG_CMD_ENV
  76 +#undef CONFIG_CMD_SAVEENV
77 77  
78 78  
79 79 #define CONFIG_BOOTDELAY 0
include/configs/cm41xx.h
... ... @@ -73,7 +73,7 @@
73 73 */
74 74 #include <config_cmd_default.h>
75 75  
76   -#undef CONFIG_CMD_ENV
  76 +#undef CONFIG_CMD_SAVEENV
77 77  
78 78  
79 79 #define CONFIG_BOOTDELAY 0
include/configs/cmi_mpc5xx.h
... ... @@ -69,7 +69,7 @@
69 69 #define CONFIG_CMD_ASKENV
70 70 #define CONFIG_CMD_BDI
71 71 #define CONFIG_CMD_CONSOLE
72   -#define CONFIG_CMD_ENV
  72 +#define CONFIG_CMD_SAVEENV
73 73 #define CONFIG_CMD_RUN
74 74 #define CONFIG_CMD_IMI
75 75  
include/configs/csb226.h
... ... @@ -78,7 +78,7 @@
78 78 #define CONFIG_CMD_FLASH
79 79 #define CONFIG_CMD_MEMORY
80 80 #define CONFIG_CMD_NET
81   -#define CONFIG_CMD_ENV
  81 +#define CONFIG_CMD_SAVEENV
82 82 #define CONFIG_CMD_RUN
83 83 #define CONFIG_CMD_ASKENV
84 84 #define CONFIG_CMD_ECHO
include/configs/dbau1x00.h
... ... @@ -97,7 +97,7 @@
97 97 #undef CONFIG_CMD_BDI
98 98 #undef CONFIG_CMD_BEDBUG
99 99 #undef CONFIG_CMD_ELF
100   -#undef CONFIG_CMD_ENV
  100 +#undef CONFIG_CMD_SAVEENV
101 101 #undef CONFIG_CMD_FAT
102 102 #undef CONFIG_CMD_FPGA
103 103 #undef CONFIG_CMD_MII
include/configs/delta.h
... ... @@ -108,7 +108,7 @@
108 108  
109 109 #else
110 110  
111   -#define CONFIG_CMD_ENV
  111 +#define CONFIG_CMD_SAVEENV
112 112 #define CONFIG_CMD_NAND
113 113 #define CONFIG_CMD_I2C
114 114  
include/configs/eNET.h
... ... @@ -75,7 +75,7 @@
75 75 #define CONFIG_CMD_BOOTD /* bootd */
76 76 #define CONFIG_CMD_CONSOLE /* coninfo */
77 77 #define CONFIG_CMD_ECHO /* echo arguments */
78   -#define CONFIG_CMD_ENV /* saveenv */
  78 +#define CONFIG_CMD_SAVEENV /* saveenv */
79 79 #define CONFIG_CMD_FLASH /* flinfo, erase, protect */
80 80 #define CONFIG_CMD_FPGA /* FPGA configuration Support */
81 81 #define CONFIG_CMD_IMI /* iminfo */
include/configs/eXalion.h
... ... @@ -77,7 +77,7 @@
77 77 #define CONFIG_CMD_I2C
78 78 #define CONFIG_CMD_IDE
79 79 #define CONFIG_CMD_FAT
80   -#define CONFIG_CMD_ENV
  80 +#define CONFIG_CMD_SAVEENV
81 81 #define CONFIG_CMD_PCI
82 82  
83 83  
include/configs/gth2.h
... ... @@ -90,7 +90,7 @@
90 90 #define CONFIG_CMD_IDE
91 91 #define CONFIG_CMD_DHCP
92 92  
93   -#undef CONFIG_CMD_ENV
  93 +#undef CONFIG_CMD_SAVEENV
94 94 #undef CONFIG_CMD_FAT
95 95 #undef CONFIG_CMD_FLASH
96 96 #undef CONFIG_CMD_FPGA
include/configs/innokom.h
... ... @@ -73,7 +73,7 @@
73 73 #define CONFIG_CMD_CACHE
74 74 #define CONFIG_CMD_DHCP
75 75 #define CONFIG_CMD_ECHO
76   -#define CONFIG_CMD_ENV
  76 +#define CONFIG_CMD_SAVEENV
77 77 #define CONFIG_CMD_FLASH
78 78 #define CONFIG_CMD_I2C
79 79 #define CONFIG_CMD_IMI
include/configs/integratorcp.h
... ... @@ -85,7 +85,7 @@
85 85 */
86 86 #define CONFIG_CMD_BDI
87 87 #define CONFIG_CMD_DHCP
88   -#define CONFIG_CMD_ENV
  88 +#define CONFIG_CMD_SAVEENV
89 89 #define CONFIG_CMD_FLASH
90 90 #define CONFIG_CMD_IMI
91 91 #define CONFIG_CMD_MEMORY
include/configs/kmeter1.h
... ... @@ -305,7 +305,7 @@
305 305 #endif
306 306  
307 307 #if defined(CFG_RAMBOOT)
308   -#undef CONFIG_CMD_ENV
  308 +#undef CONFIG_CMD_SAVEENV
309 309 #undef CONFIG_CMD_LOADS
310 310 #endif
311 311  
include/configs/logodl.h
... ... @@ -69,7 +69,7 @@
69 69 */
70 70 #define CONFIG_CMD_ASKENV
71 71 #define CONFIG_CMD_ECHO
72   -#define CONFIG_CMD_ENV
  72 +#define CONFIG_CMD_SAVEENV
73 73 #define CONFIG_CMD_FLASH
74 74 #define CONFIG_CMD_MEMORY
75 75 #define CONFIG_CMD_RUN
include/configs/m501sk.h
... ... @@ -154,7 +154,7 @@
154 154 #define CONFIG_CMD_IMI
155 155 #define CONFIG_CMD_NFS
156 156 #define CONFIG_CMD_FLASH
157   -#define CONFIG_CMD_ENV
  157 +#define CONFIG_CMD_SAVEENV
158 158  
159 159 #define CONFIG_SYS_HUSH_PARSER
160 160 #define CONFIG_AUTO_COMPLETE
include/configs/microblaze-generic.h
... ... @@ -248,7 +248,7 @@
248 248 #define CONFIG_CMD_JFFS2
249 249  
250 250 #if !defined(RAMENV)
251   - #define CONFIG_CMD_ENV
  251 + #define CONFIG_CMD_SAVEENV
252 252 #define CONFIG_CMD_SAVES
253 253 #endif
254 254 #else
include/configs/mpc7448hpc2.h
... ... @@ -163,7 +163,7 @@
163 163 #define CONFIG_CMD_SDRAM
164 164 #define CONFIG_CMD_EEPROM
165 165 #define CONFIG_CMD_FLASH
166   -#define CONFIG_CMD_ENV
  166 +#define CONFIG_CMD_SAVEENV
167 167 #define CONFIG_CMD_BSP
168 168 #define CONFIG_CMD_DHCP
169 169 #define CONFIG_CMD_PING
include/configs/mpr2.h
... ... @@ -27,7 +27,7 @@
27 27 #define __MPR2_H
28 28  
29 29 /* Supported commands */
30   -#define CONFIG_CMD_ENV
  30 +#define CONFIG_CMD_SAVEENV
31 31 #define CONFIG_CMD_CACHE
32 32 #define CONFIG_CMD_MEMORY
33 33 #define CONFIG_CMD_FLASH
include/configs/ms7720se.h
... ... @@ -31,7 +31,7 @@
31 31 #define CONFIG_MS7720SE 1
32 32  
33 33 #define CONFIG_CMD_FLASH
34   -#define CONFIG_CMD_ENV
  34 +#define CONFIG_CMD_SAVEENV
35 35 #define CONFIG_CMD_SDRAM
36 36 #define CONFIG_CMD_MEMORY
37 37 #define CONFIG_CMD_CACHE
include/configs/ms7722se.h
... ... @@ -38,7 +38,7 @@
38 38 #define CONFIG_CMD_DFL
39 39 #define CONFIG_CMD_SDRAM
40 40 #define CONFIG_CMD_MEMORY
41   -#define CONFIG_CMD_ENV
  41 +#define CONFIG_CMD_SAVEENV
42 42  
43 43 #define CONFIG_BAUDRATE 115200
44 44 #define CONFIG_BOOTDELAY 3
include/configs/ms7750se.h
... ... @@ -40,7 +40,7 @@
40 40  
41 41 #define CONFIG_CMD_DFL
42 42 #define CONFIG_CMD_FLASH
43   -#define CONFIG_CMD_ENV
  43 +#define CONFIG_CMD_SAVEENV
44 44  
45 45 #define CONFIG_SCIF_CONSOLE 1
46 46 #define CONFIG_BAUDRATE 38400
include/configs/netstar.h
... ... @@ -140,7 +140,7 @@
140 140 #define CONFIG_CMD_BDI
141 141 #define CONFIG_CMD_BOOTD
142 142 #define CONFIG_CMD_DHCP
143   -#define CONFIG_CMD_ENV
  143 +#define CONFIG_CMD_SAVEENV
144 144 #define CONFIG_CMD_FLASH
145 145 #define CONFIG_CMD_IMI
146 146 #define CONFIG_CMD_JFFS2
include/configs/pb1x00.h
... ... @@ -198,7 +198,7 @@
198 198 #define CONFIG_CMD_MII
199 199 #define CONFIG_CMD_PING
200 200  
201   -#undef CONFIG_CMD_ENV
  201 +#undef CONFIG_CMD_SAVEENV
202 202 #undef CONFIG_CMD_FAT
203 203 #undef CONFIG_CMD_FLASH
204 204 #undef CONFIG_CMD_FPGA
include/configs/ppmc7xx.h
... ... @@ -83,7 +83,7 @@
83 83 #include <config_cmd_default.h>
84 84  
85 85 #define CONFIG_CMD_FLASH
86   -#define CONFIG_CMD_ENV
  86 +#define CONFIG_CMD_SAVEENV
87 87 #define CONFIG_CMD_RUN
88 88 #define CONFIG_CMD_ELF
89 89 #define CONFIG_CMD_NET
include/configs/r7780mp.h
... ... @@ -43,7 +43,7 @@
43 43 #define CONFIG_CMD_PCI
44 44 #define CONFIG_CMD_NET
45 45 #define CONFIG_CMD_PING
46   -#define CONFIG_CMD_ENV
  46 +#define CONFIG_CMD_SAVEENV
47 47 #define CONFIG_CMD_NFS
48 48 #define CONFIG_CMD_IDE
49 49 #define CONFIG_CMD_EXT2
include/configs/rsk7203.h
... ... @@ -37,7 +37,7 @@
37 37 #define CONFIG_CMD_NET
38 38 #define CONFIG_CMD_NFS
39 39 #define CONFIG_CMD_PING
40   -#define CONFIG_CMD_ENV
  40 +#define CONFIG_CMD_SAVEENV
41 41 #define CONFIG_CMD_SDRAM
42 42 #define CONFIG_CMD_MEMORY
43 43 #define CONFIG_CMD_CACHE
include/configs/sbc8240.h
... ... @@ -96,7 +96,7 @@
96 96 #define CONFIG_CMD_BSP
97 97 #define CONFIG_CMD_DIAG
98 98 #define CONFIG_CMD_ELF
99   -#define CONFIG_CMD_ENV
  99 +#define CONFIG_CMD_SAVEENV
100 100 #define CONFIG_CMD_FLASH
101 101 #define CONFIG_CMD_PCI
102 102 #define CONFIG_CMD_PING
include/configs/sbc8349.h
... ... @@ -455,7 +455,7 @@
455 455 #endif
456 456  
457 457 #if defined(CONFIG_SYS_RAMBOOT)
458   - #undef CONFIG_CMD_ENV
  458 + #undef CONFIG_CMD_SAVEENV
459 459 #undef CONFIG_CMD_LOADS
460 460 #endif
461 461  
include/configs/sbc8560.h
... ... @@ -380,7 +380,7 @@
380 380 #endif
381 381  
382 382 #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_RAM_AS_FLASH)
383   - #undef CONFIG_CMD_ENV
  383 + #undef CONFIG_CMD_SAVEENV
384 384 #undef CONFIG_CMD_LOADS
385 385 #endif
386 386  
include/configs/sh7763rdp.h
... ... @@ -40,7 +40,7 @@
40 40 #define CONFIG_CMD_MEMORY
41 41 #define CONFIG_CMD_NET
42 42 #define CONFIG_CMD_PING
43   -#define CONFIG_CMD_ENV
  43 +#define CONFIG_CMD_SAVEENV
44 44 #define CONFIG_CMD_NFS
45 45 #define CONFIG_CMD_JFFS2
46 46  
include/configs/sh7785lcr.h
... ... @@ -40,7 +40,7 @@
40 40 #define CONFIG_CMD_DFL
41 41 #define CONFIG_CMD_SDRAM
42 42 #define CONFIG_CMD_RUN
43   -#define CONFIG_CMD_ENV
  43 +#define CONFIG_CMD_SAVEENV
44 44  
45 45 #define CONFIG_CMD_USB
46 46 #define CONFIG_USB_STORAGE
include/configs/smdk6400.h
... ... @@ -104,7 +104,7 @@
104 104 #define CONFIG_CMD_REGINFO
105 105 #define CONFIG_CMD_LOADS
106 106 #define CONFIG_CMD_LOADB
107   -#define CONFIG_CMD_ENV
  107 +#define CONFIG_CMD_SAVEENV
108 108 #define CONFIG_CMD_NAND
109 109 #if defined(CONFIG_BOOT_ONENAND)
110 110 #define CONFIG_CMD_ONENAND
include/configs/stxgp3.h
... ... @@ -322,7 +322,7 @@
322 322 #define CONFIG_CMD_I2C
323 323  
324 324 #if defined(CONFIG_SYS_RAMBOOT)
325   - #undef CONFIG_CMD_ENV
  325 + #undef CONFIG_CMD_SAVEENV
326 326 #undef CONFIG_CMD_LOADS
327 327 #else
328 328 #define CONFIG_CMD_ELF
include/configs/stxssa.h
... ... @@ -363,7 +363,7 @@
363 363 #endif
364 364  
365 365 #if defined(CONFIG_SYS_RAMBOOT)
366   - #undef CONFIG_CMD_ENV
  366 + #undef CONFIG_CMD_SAVEENV
367 367 #undef CONFIG_CMD_LOADS
368 368 #else
369 369 #define CONFIG_CMD_ELF
include/configs/suzaku.h
... ... @@ -62,7 +62,7 @@
62 62 #include <config_cmd_default.h>
63 63  
64 64 #undef CONFIG_CMD_BDI
65   -#undef CONFIG_CMD_ENV
  65 +#undef CONFIG_CMD_SAVEENV
66 66 #undef CONFIG_CMD_MEMORY
67 67 #undef CONFIG_CMD_NET
68 68 #undef CONFIG_CMD_MISC
include/configs/utx8245.h
... ... @@ -105,7 +105,7 @@
105 105 #define CONFIG_CMD_PCI
106 106 #define CONFIG_CMD_FLASH
107 107 #define CONFIG_CMD_MEMORY
108   -#define CONFIG_CMD_ENV
  108 +#define CONFIG_CMD_SAVEENV
109 109 #define CONFIG_CMD_CONSOLE
110 110 #define CONFIG_CMD_LOADS
111 111 #define CONFIG_CMD_LOADB
include/configs/versatile.h
... ... @@ -108,7 +108,7 @@
108 108 #define CONFIG_CMD_BDI
109 109 #define CONFIG_CMD_MEMORY
110 110 #define CONFIG_CMD_FLASH
111   -#define CONFIG_CMD_ENV
  111 +#define CONFIG_CMD_SAVEENV
112 112  
113 113  
114 114 /*
include/configs/voiceblue.h
... ... @@ -127,7 +127,7 @@
127 127 #define CONFIG_CMD_BDI
128 128 #define CONFIG_CMD_BOOTD
129 129 #define CONFIG_CMD_DHCP
130   -#define CONFIG_CMD_ENV
  130 +#define CONFIG_CMD_SAVEENV
131 131 #define CONFIG_CMD_FLASH
132 132 #define CONFIG_CMD_IMI
133 133 #define CONFIG_CMD_JFFS2
include/configs/zylonite.h
... ... @@ -94,7 +94,7 @@
94 94 #ifdef TURN_ON_ETHERNET
95 95 #define CONFIG_CMD_PING
96 96 #else
97   - #define CONFIG_CMD_ENV
  97 + #define CONFIG_CMD_SAVEENV
98 98 #define CONFIG_CMD_NAND
99 99  
100 100 #undef CONFIG_CMD_NET