diff options
| author | Marek Vasut | 2020-05-22 01:10:14 +0200 |
|---|---|---|
| committer | Tom Rini | 2020-05-25 11:54:53 -0400 |
| commit | 3ec46991d71aa4772aeeafbce116c56ad8670fba (patch) | |
| tree | 75e7c5b7adf4ffcb95ba779f47a2e1a2d694d5ec | |
| parent | 2aca8804d8d5f84d2d661e76e8d232c5c12445b5 (diff) | |
env: Convert ENV_ACCESS_IGNORE_FORCE to Kconfig
Convert ENV_ACCESS_IGNORE_FORCE to Kconfig, no functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | env/Kconfig | 7 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 7 insertions, 5 deletions
@@ -2729,10 +2729,6 @@ Configuration Settings: regular expression. This allows multiple variables to define the same flags without explicitly listing them for each variable. -- CONFIG_ENV_ACCESS_IGNORE_FORCE - If defined, don't allow the -f switch to env set override variable - access flags. - The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: diff --git a/env/Kconfig b/env/Kconfig index ed94e83ec1e..ca7fef682b7 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -604,6 +604,13 @@ config DELAY_ENVIRONMENT later by U-Boot code. With CONFIG_OF_CONTROL this is instead controlled by the value of /config/load-environment. +config ENV_ACCESS_IGNORE_FORCE + bool "Block forced environment operations" + default n + help + If defined, don't allow the -f switch to env set override variable + access flags. + if SPL_ENV_SUPPORT config SPL_ENV_IS_NOWHERE bool "SPL Environment is not stored" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9b6b45116a4..5566de96068 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -415,7 +415,6 @@ CONFIG_ENABLE_36BIT_PHYS CONFIG_ENABLE_MMU CONFIG_ENABLE_MUST_CHECK CONFIG_ENABLE_WARN_DEPRECATED -CONFIG_ENV_ACCESS_IGNORE_FORCE CONFIG_ENV_ADDR_FLEX CONFIG_ENV_CALLBACK_LIST_DEFAULT CONFIG_ENV_CALLBACK_LIST_STATIC |