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

[u-boot] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index 20321f862e182b20c6b3bfbda19e13da25cf6182..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
@@ -68,40 +53,10 @@ config ENV_IS_IN_EEPROM
          These two #defines specify the offset and size of the
          environment area within the total memory of your EEPROM.
 
-         - CONFIG_SYS_I2C_EEPROM_ADDR:
-         If defined, specified the chip address of the EEPROM device.
-         The default address is zero.
-
-         - CONFIG_SYS_I2C_EEPROM_BUS:
-         If defined, specified the i2c bus of the EEPROM device.
-
-         - CONFIG_SYS_EEPROM_PAGE_WRITE_BITS:
-         If defined, the number of bits used to address bytes in a
-         single page in the EEPROM device.  A 64 byte page, for example
-         would require six bits.
-
-         - CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS:
-         If defined, the number of milliseconds to delay between
-         page writes.  The default is zero milliseconds.
-
-         - CONFIG_SYS_I2C_EEPROM_ADDR_LEN:
-         The length in bytes of the EEPROM memory array address.  Note
-         that this is NOT the chip address length!
-
-         - CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW:
-         EEPROM chips that implement "address overflow" are ones
-         like Catalyst 24WC04/08/16 which has 9/10/11 bits of
-         address and the extra bits end up in the "chip address" bit
-         slots. This makes a 24WC08 (1Kbyte) chip look like four 256
-         byte chips.
-
          Note that we consider the length of the address field to
          still be one byte because the extra address bits are hidden
          in the chip address.
 
-         - CONFIG_SYS_EEPROM_SIZE:
-         The size in bytes of the EEPROM device.
-
          - CONFIG_ENV_EEPROM_IS_ON_I2C
          define this, if you have I2C and SPI activated, and your
          EEPROM, which holds the environment, is on the I2C bus.