Merge git://git.denx.de/u-boot-x86

[u-boot] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index 024d4d79bd49117694f0093362cdf5d45cfc4321..2477bf85309b20d6aba37ce72b34d7584154a5fc 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -3,7 +3,6 @@ menu "Environment"
 choice
        prompt "Select the location of the environment"
        default ENV_IS_IN_MMC if ARCH_SUNXI
-       default ENV_IS_IN_MMC if ARCH_UNIPHIER
        default ENV_IS_IN_MMC if ARCH_EXYNOS4
        default ENV_IS_IN_MMC if MX6SX || MX7D
        default ENV_IS_IN_MMC if TEGRA30 || TEGRA124
@@ -17,6 +16,7 @@ choice
        default ENV_IS_IN_FLASH if SH && !CPU_SH4
        default ENV_IS_IN_SPI_FLASH if ARMADA_XP
        default ENV_IS_IN_SPI_FLASH if INTEL_BAYTRAIL
+       default ENV_IS_IN_SPI_FLASH if INTEL_BRASWELL
        default ENV_IS_IN_SPI_FLASH if INTEL_BROADWELL
        default ENV_IS_IN_SPI_FLASH if NORTHBRIDGE_INTEL_IVYBRIDGE
        default ENV_IS_IN_SPI_FLASH if INTEL_QUARK
@@ -40,21 +40,6 @@ config ENV_IS_NOWHERE
          stored. U-Boot will therefore always start up with a default
          environment.
 
-config ENV_IS_IN_DATAFLASH
-       bool "Environment in dataflash"
-       depends on !CHAIN_OF_TRUST
-       help
-         Define this if you have a DataFlash memory device which you
-         want to use for the environment.
-
-         - CONFIG_ENV_OFFSET:
-         - CONFIG_ENV_ADDR:
-         - CONFIG_ENV_SIZE:
-
-         These three #defines specify the offset and size of the
-         environment area within the total memory of your DataFlash placed
-         at the specified address.
-
 config ENV_IS_IN_EEPROM
        bool "Environment in EEPROM"
        depends on !CHAIN_OF_TRUST
@@ -375,14 +360,6 @@ config ENV_IS_IN_UBI
 
 endchoice
 
-config ENV_AES
-       bool "AES-128 encryption for stored environment (DEPRECATED)"
-       help
-         Enable this to have the on-device stored environment be encrypted
-         with AES-128.  The implementation here however has security
-         complications and is not recommended for use.  Please see
-         CVE-2017-3225 and CVE-2017-3226 for more details.
-
 config ENV_FAT_INTERFACE
        string "Name of the block device for the environment"
        depends on ENV_IS_IN_FAT