rockchip: move CONFIG_ENV_SIZE and CONFIG_ENV_OFFSET to Kconfig

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

diff --git a/env/Kconfig b/env/Kconfig
index 748f534..bef6e89 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -3,25 +3,25 @@ menu "Environment"
 choice
        prompt "Select the location of the environment"
        default ENV_IS_IN_MMC if ARCH_SUNXI
 choice
        prompt "Select the location of the environment"
        default ENV_IS_IN_MMC if ARCH_SUNXI

-       default ENV_IS_IN_FAT if ARCH_BCM283X
-       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 ARCH_EXYNOS4
        default ENV_IS_IN_MMC if MX6SX || MX7D

-       default ENV_IS_IN_FLASH if ARCH_CINTEGRATOR
-       default ENV_IS_IN_SPI_FLASH if ARMADA_XP

        default ENV_IS_IN_MMC if TEGRA30 || TEGRA124
        default ENV_IS_IN_MMC if TEGRA_ARMV8_COMMON
        default ENV_IS_IN_MMC if TEGRA30 || TEGRA124
        default ENV_IS_IN_MMC if TEGRA_ARMV8_COMMON

+       default ENV_IS_IN_FLASH if ARCH_CINTEGRATOR

        default ENV_IS_IN_FLASH if ARCH_INTEGRATOR_CP
        default ENV_IS_IN_FLASH if M548x || M547x || M5282 || MCF547x_8x
        default ENV_IS_IN_FLASH if MCF532x || MCF52x2
        default ENV_IS_IN_FLASH if MPC86xx || MPC83xx
        default ENV_IS_IN_FLASH if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
        default ENV_IS_IN_FLASH if SH && !CPU_SH4
        default ENV_IS_IN_FLASH if ARCH_INTEGRATOR_CP
        default ENV_IS_IN_FLASH if M548x || M547x || M5282 || MCF547x_8x
        default ENV_IS_IN_FLASH if MCF532x || MCF52x2
        default ENV_IS_IN_FLASH if MPC86xx || MPC83xx
        default ENV_IS_IN_FLASH if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
        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_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
        default ENV_IS_IN_SPI_FLASH if INTEL_QUEENSBAY
        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
        default ENV_IS_IN_SPI_FLASH if INTEL_QUEENSBAY

+       default ENV_IS_IN_FAT if ARCH_BCM283X

        default ENV_IS_IN_FAT if MMC_OMAP_HS && TI_COMMON_CMD_OPTIONS
        default ENV_IS_NOWHERE
        help
        default ENV_IS_IN_FAT if MMC_OMAP_HS && TI_COMMON_CMD_OPTIONS
        default ENV_IS_NOWHERE
        help


@@ -40,21 +40,6 @@ config ENV_IS_NOWHERE
          stored. U-Boot will therefore always start up with a default
          environment.
 
          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
 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.
 
          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.
 
          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.
          - 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.


@@ -472,4 +427,22 @@ config ENV_UBI_VOLUME
 
 endif
 
 
 endif
 

+if ARCH_ROCKCHIP
+
+config ENV_OFFSET
+       hex
+       depends on !ENV_IS_IN_UBI
+       depends on !ENV_IS_NOWHERE
+       default 0x3f8000
+       help
+         Offset from the start of the device (or partition)
+
+config ENV_SIZE
+       hex
+       default 0x8000
+       help
+         Size of the environment storage area
+
+endif
+

 endmenu
 endmenu