Signed-off-by: Tom Rini trini@konsulko.com --- README | 6 +++--- include/configs/aristainetos2.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/env_flags.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README b/README index 103562bbbe8d..71767e32d11b 100644 --- a/README +++ b/README @@ -1132,7 +1132,7 @@ The following options need to be configured: The same can be accomplished in a more flexible way for any variable by configuring the type of access to allow for those variables in the ".flags" variable - or define CONFIG_ENV_FLAGS_LIST_STATIC. + or define CFG_ENV_FLAGS_LIST_STATIC.
- Protected RAM: CONFIG_PRAM @@ -1496,7 +1496,7 @@ Configuration Settings: this option if you really know what you are doing.
- CONFIG_ENV_FLAGS_LIST_DEFAULT -- CONFIG_ENV_FLAGS_LIST_STATIC +- CFG_ENV_FLAGS_LIST_STATIC Enable validation of the values given to environment variables when calling env set. Variables can be restricted to only decimal, hexadecimal, or boolean. If CONFIG_CMD_NET is also defined, @@ -1527,7 +1527,7 @@ Configuration Settings: Define this to a list (string) to define the ".flags" environment variable in the default or embedded environment.
- - CONFIG_ENV_FLAGS_LIST_STATIC + - CFG_ENV_FLAGS_LIST_STATIC Define this to a list (string) to define validation that should be done if an entry is not found in the ".flags" environment variable. To override a setting in the static diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 6faf544d21b6..e80166b3c467 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -420,7 +420,7 @@
/* UBI support */
-#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ +#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ "sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
#endif /* __ARISTAINETOS2_CONFIG_H */ diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 99da081cdae8..392f97050a65 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -45,7 +45,7 @@ "save_env=env save; env save\0" \ "altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0"
-#define CONFIG_ENV_FLAGS_LIST_STATIC \ +#define CFG_ENV_FLAGS_LIST_STATIC \ "bootset:bw," \ "clone_pending:bw," \ "endurance_test:bw," \ diff --git a/include/env_flags.h b/include/env_flags.h index 313cb8c49a6d..e4e40169aed0 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -35,8 +35,8 @@ enum env_flags_varaccess { #define ENV_FLAGS_VARTYPE_LOC 0 #define ENV_FLAGS_VARACCESS_LOC 1
-#ifndef CONFIG_ENV_FLAGS_LIST_STATIC -#define CONFIG_ENV_FLAGS_LIST_STATIC "" +#ifndef CFG_ENV_FLAGS_LIST_STATIC +#define CFG_ENV_FLAGS_LIST_STATIC "" #endif
#ifdef CONFIG_NET @@ -77,7 +77,7 @@ enum env_flags_varaccess { ETHADDR_FLAGS \ NET_FLAGS \ SERIAL_FLAGS \ - CONFIG_ENV_FLAGS_LIST_STATIC + CFG_ENV_FLAGS_LIST_STATIC
#ifdef CONFIG_CMD_ENV_FLAGS /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 97ad18677f1d..8d9496e6edba 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -10,7 +10,7 @@ CFG_DM9000_BYTE_SWAPPED CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT CFG_DW_WDT_CLOCK_KHZ -CONFIG_ENV_FLAGS_LIST_STATIC +CFG_ENV_FLAGS_LIST_STATIC CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS CONFIG_ENV_SETTINGS_NAND_V1