configs: Resync with savedefconfig

[oweals/u-boot.git] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index 2d972a5d4f34999fd5808c2651feac04ee1f473f..ca7fef682b72c233c6deb4cd53dc87d25041740a 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -3,6 +3,9 @@ menu "Environment"
 config ENV_SUPPORT
        def_bool y
 
+config SAVEENV
+       def_bool y if CMD_SAVEENV
+
 config ENV_IS_NOWHERE
        bool "Environment is not stored"
        default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \
@@ -404,8 +407,7 @@ config SYS_REDUNDAND_ENVIRONMENT
 config ENV_FAT_INTERFACE
        string "Name of the block device for the environment"
        depends on ENV_IS_IN_FAT
-       default "mmc" if ARCH_SUNXI
-       default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91
+       default "mmc"
        help
          Define this to a string that is the name of the block device.
 
@@ -590,6 +592,25 @@ config ENV_VARS_UBOOT_RUNTIME_CONFIG
          run-time determined information about the hardware to the
          environment.  These will be named board_name, board_rev.
 
+config DELAY_ENVIRONMENT
+       bool "Delay environment loading"
+       depends on !OF_CONTROL
+       help
+         Enable this to inhibit loading the environment during board
+         initialization. This can address the security risk of untrusted data
+         being used during boot. Normally the environment is loaded when the
+         board is initialised so that it is available to U-Boot. This inhibits
+         that so that the environment is not available until explicitly loaded
+         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"