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>

diff --git a/README b/README
index be9e6391d6b8f90e1151abb5883f4b0a67d56753..17dc0ee33ba23d18f504de11fb5106f91aa328fa 100644 (file)
--- 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 ed94e83ec1e81b96426edfea153b40bd52ae27c4..ca7fef682b72c233c6deb4cd53dc87d25041740a 100644 (file)
--- 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 9b6b45116a4c53f9abf45bd4c720f98b81380158..5566de96068e2d145de924d9fdfa609f828e5127 100644 (file)
--- 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