Commit bdab39d358e63aa47f400a8a76b8d5f283842df3
Committed by
Wolfgang Denk
1 parent
8b0592b89e
Exists in
master
and in
54 other branches
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
- README
- common/cmd_nvedit.c
- common/env_flash.c
- common/env_nand.c
- include/config_cmd_all.h
- include/config_cmd_default.h
- include/configs/CRAYL1.h
- include/configs/EP1S10.h
- include/configs/EP1S40.h
- include/configs/ERIC.h
- include/configs/FLAGADM.h
- include/configs/MPC8313ERDB.h
- include/configs/MPC8315ERDB.h
- include/configs/MPC8323ERDB.h
- include/configs/MPC832XEMDS.h
- include/configs/MPC8349EMDS.h
- include/configs/MPC8360EMDS.h
- include/configs/MPC8360ERDK.h
- include/configs/MPC837XEMDS.h
- include/configs/MPC837XERDB.h
- include/configs/MPC8540ADS.h
- include/configs/MPC8540EVAL.h
- include/configs/MPC8560ADS.h
- include/configs/MPC8610HPCD.h
- include/configs/MPC8641HPCN.h
- include/configs/MVBLUE.h
- include/configs/MVS1.h
- include/configs/MigoR.h
- include/configs/PATI.h
- include/configs/PCI5441.h
- include/configs/PK1C20.h
- include/configs/PM854.h
- include/configs/PM856.h
- include/configs/PN62.h
- include/configs/QS823.h
- include/configs/QS850.h
- include/configs/SBC8540.h
- include/configs/SIMPC8313.h
- include/configs/SPD823TS.h
- include/configs/TQM834x.h
- include/configs/VoVPN-GW.h
- include/configs/XPEDITE5200.h
- include/configs/XPEDITE5370.h
- include/configs/ap325rxa.h
- include/configs/cm4008.h
- include/configs/cm41xx.h
- include/configs/cmi_mpc5xx.h
- include/configs/csb226.h
- include/configs/dbau1x00.h
- include/configs/delta.h
- include/configs/eNET.h
- include/configs/eXalion.h
- include/configs/gth2.h
- include/configs/innokom.h
- include/configs/integratorcp.h
- include/configs/kmeter1.h
- include/configs/logodl.h
- include/configs/m501sk.h
- include/configs/microblaze-generic.h
- include/configs/mpc7448hpc2.h
- include/configs/mpr2.h
- include/configs/ms7720se.h
- include/configs/ms7722se.h
- include/configs/ms7750se.h
- include/configs/netstar.h
- include/configs/pb1x00.h
- include/configs/ppmc7xx.h
- include/configs/r7780mp.h
- include/configs/rsk7203.h
- include/configs/sbc8240.h
- include/configs/sbc8349.h
- include/configs/sbc8560.h
- include/configs/sh7763rdp.h
- include/configs/sh7785lcr.h
- include/configs/smdk6400.h
- include/configs/stxgp3.h
- include/configs/stxssa.h
- include/configs/suzaku.h
- include/configs/utx8245.h
- include/configs/versatile.h
- include/configs/voiceblue.h
- include/configs/zylonite.h
README
... | ... | @@ -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 |
common/cmd_nvedit.c
... | ... | @@ -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 | { |
common/env_flash.c
... | ... | @@ -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) |
common/env_nand.c
... | ... | @@ -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
include/configs/EP1S10.h
include/configs/EP1S40.h
include/configs/ERIC.h
include/configs/FLAGADM.h
include/configs/MPC8313ERDB.h
include/configs/MPC8315ERDB.h
include/configs/MPC8323ERDB.h
include/configs/MPC832XEMDS.h
include/configs/MPC8349EMDS.h
include/configs/MPC8360EMDS.h
include/configs/MPC8360ERDK.h
include/configs/MPC837XEMDS.h
include/configs/MPC837XERDB.h
include/configs/MPC8540ADS.h
include/configs/MPC8540EVAL.h
include/configs/MPC8560ADS.h
include/configs/MPC8610HPCD.h
include/configs/MPC8641HPCN.h
include/configs/MVBLUE.h
include/configs/MVS1.h
include/configs/MigoR.h
include/configs/PATI.h
include/configs/PCI5441.h
include/configs/PK1C20.h
include/configs/PM854.h
include/configs/PM856.h
include/configs/PN62.h
include/configs/QS823.h
include/configs/QS850.h
include/configs/SBC8540.h
include/configs/SIMPC8313.h
include/configs/SPD823TS.h
include/configs/TQM834x.h
include/configs/VoVPN-GW.h
include/configs/XPEDITE5200.h
include/configs/XPEDITE5370.h
include/configs/ap325rxa.h
include/configs/cm4008.h
include/configs/cm41xx.h
include/configs/cmi_mpc5xx.h
include/configs/csb226.h
include/configs/dbau1x00.h
include/configs/delta.h
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
include/configs/gth2.h
include/configs/innokom.h
include/configs/integratorcp.h
include/configs/kmeter1.h
include/configs/logodl.h
include/configs/m501sk.h
include/configs/microblaze-generic.h
include/configs/mpc7448hpc2.h
include/configs/mpr2.h
include/configs/ms7720se.h
include/configs/ms7722se.h
include/configs/ms7750se.h
include/configs/netstar.h
include/configs/pb1x00.h
include/configs/ppmc7xx.h
include/configs/r7780mp.h
include/configs/rsk7203.h
include/configs/sbc8240.h
include/configs/sbc8349.h
include/configs/sbc8560.h
include/configs/sh7763rdp.h
include/configs/sh7785lcr.h
include/configs/smdk6400.h
include/configs/stxgp3.h
include/configs/stxssa.h
include/configs/suzaku.h
include/configs/utx8245.h
include/configs/versatile.h
include/configs/voiceblue.h