Convert ENV_ACCESS_IGNORE_FORCE to Kconfig, no functional change.
Signed-off-by: Marek Vasut
Cc: Tom Rini
---
README | 4
env/Kconfig | 7 +++
scripts/config_whitelist.txt | 1 -
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/README b/README
index be9e6391d6..17dc0ee33b 100644
--- a/README
+++ b/README
@@ -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 ed94e83ec1..ca7fef682b 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 3f5e6504e1..0b3fb728a0 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
--
2.25.1
