arm: wandboard: move CONFIG_MXC_UART to defconfig

[platform/kernel/u-boot.git] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index ed94e83..38e7fad 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -562,7 +562,7 @@ config ENV_UBI_VID_OFFSET
          UBI VID offset for environment. If 0, no custom VID offset is used.
 
 config SYS_RELOC_GD_ENV_ADDR
-       bool "Relocate gd->en_addr"
+       bool "Relocate gd->env_addr"
        help
          Relocate the early env_addr pointer so we know it is not inside
          the binary. Some systems need this and for the rest, it doesn't hurt.
@@ -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"