Merge branch '2020-05-19-misc-fixes'

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

diff --git a/env/Kconfig b/env/Kconfig
index 8ab7be11c5be3fe7848267e8c50faf349ea7ed09..ed94e83ec1e81b96426edfea153b40bd52ae27c4 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 && \
@@ -589,6 +592,18 @@ 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.
+
 if SPL_ENV_SUPPORT
 config SPL_ENV_IS_NOWHERE
        bool "SPL Environment is not stored"