ARM: rmobile: Represent SF partitioning with mtdparts on Gose

[u-boot] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index c8dd65f3a51bccae84bbde4b269523ed391fa71b..f403906b6f90c3231f6e99c17157a01aeb3fad2b 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -1,19 +1,24 @@
 menu "Environment"
 
 menu "Environment"
 

-config ENV_IS_IN_DATAFLASH
-       bool "Environment in dataflash"
-       depends on !CHAIN_OF_TRUST
+config ENV_IS_NOWHERE
+       bool "Environment is not stored"
+       depends on !ENV_IS_IN_EEPROM
+       depends on !ENV_IS_IN_FAT
+       depends on !ENV_IS_IN_FLASH
+       depends on !ENV_IS_IN_MMC
+       depends on !ENV_IS_IN_NAND
+       depends on !ENV_IS_IN_NVRAM
+       depends on !ENV_IS_IN_ONENAND
+       depends on !ENV_IS_IN_REMOTE
+       depends on !ENV_IS_IN_SPI_FLASH
+       depends on !ENV_IS_IN_UBI
+       default y

        help
        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.
+         Define this if you don't want to or can't have an environment stored
+         on a storage medium. In this case the environemnt will still exist
+         while U-Boot is running, but once U-Boot exits it will not be
+         stored. U-Boot will therefore always start up with a default
+         environment.

 
 config ENV_IS_IN_EEPROM
        bool "Environment in EEPROM"
 
 config ENV_IS_IN_EEPROM
        bool "Environment in EEPROM"


@@ -28,40 +33,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.


@@ -79,16 +54,31 @@ config ENV_IS_IN_EEPROM
 config ENV_IS_IN_FAT
        bool "Environment is in a FAT filesystem"
        depends on !CHAIN_OF_TRUST
 config ENV_IS_IN_FAT
        bool "Environment is in a FAT filesystem"
        depends on !CHAIN_OF_TRUST

+       default y if ARCH_BCM283X
+       default y if ARCH_SUNXI && MMC
+       default y if MMC_OMAP_HS && TI_COMMON_CMD_OPTIONS
+       select FS_FAT

        select FAT_WRITE
        help
          Define this if you want to use the FAT file system for the environment.
 
        select FAT_WRITE
        help
          Define this if you want to use the FAT file system for the environment.
 

-         - CONFIG_FAT_WRITE:
-         This must be enabled. Otherwise it cannot save the environment file.
+config ENV_IS_IN_EXT4
+       bool "Environment is in a EXT4 filesystem"
+       depends on !CHAIN_OF_TRUST
+       select EXT4_WRITE
+       help
+         Define this if you want to use the EXT4 file system for the environment.

 
 config ENV_IS_IN_FLASH
        bool "Environment in flash memory"
        depends on !CHAIN_OF_TRUST
 
 config ENV_IS_IN_FLASH
        bool "Environment in flash memory"
        depends on !CHAIN_OF_TRUST

+       default y if ARCH_CINTEGRATOR
+       default y if ARCH_INTEGRATOR_CP
+       default y if M548x || M547x || M5282 || MCF547x_8x
+       default y if MCF532x || MCF52x2
+       default y if MPC86xx || MPC83xx
+       default y if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
+       default y if SH && !CPU_SH4

        help
          Define this if you have a flash device which you want to use for the
          environment.
        help
          Define this if you have a flash device which you want to use for the
          environment.


@@ -161,7 +151,11 @@ config ENV_IS_IN_FLASH
 config ENV_IS_IN_MMC
        bool "Environment in an MMC device"
        depends on !CHAIN_OF_TRUST
 config ENV_IS_IN_MMC
        bool "Environment in an MMC device"
        depends on !CHAIN_OF_TRUST

-       default y if ARCH_SUNXI
+       depends on MMC
+       default y if ARCH_EXYNOS4
+       default y if MX6SX || MX7D
+       default y if TEGRA30 || TEGRA124
+       default y if TEGRA_ARMV8_COMMON

        help
          Define this if you have an MMC device which you want to use for the
          environment.
        help
          Define this if you have an MMC device which you want to use for the
          environment.


@@ -299,6 +293,13 @@ config ENV_IS_IN_REMOTE
 config ENV_IS_IN_SPI_FLASH
        bool "Environment is in SPI flash"
        depends on !CHAIN_OF_TRUST
 config ENV_IS_IN_SPI_FLASH
        bool "Environment is in SPI flash"
        depends on !CHAIN_OF_TRUST

+       default y if ARMADA_XP
+       default y if INTEL_BAYTRAIL
+       default y if INTEL_BRASWELL
+       default y if INTEL_BROADWELL
+       default y if NORTHBRIDGE_INTEL_IVYBRIDGE
+       default y if INTEL_QUARK
+       default y if INTEL_QUEENSBAY

        help
          Define this if you have a SPI Flash memory device which you
          want to use for the environment.
        help
          Define this if you have a SPI Flash memory device which you
          want to use for the environment.


@@ -358,21 +359,10 @@ config ENV_IS_IN_UBI
          the environment in.  This will enable redundant environments in UBI.
          It is assumed that both volumes are in the same MTD partition.
 
          the environment in.  This will enable redundant environments in UBI.
          It is assumed that both volumes are in the same MTD partition.
 

-         - CONFIG_UBI_SILENCE_MSG
-         - CONFIG_UBIFS_SILENCE_MSG
-
-         You will probably want to define these to avoid a really noisy system
-         when storing the env in UBI.
-
-config ENV_IS_NOWHERE
-       bool "Environment is not stored"
-       help
-         Define this if you don't want to or can't have an environment stored
-         on a storage medium
-

 config ENV_FAT_INTERFACE
        string "Name of the block device for the environment"
        depends on ENV_IS_IN_FAT
 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
        help
          Define this to a string that is the name of the block device.
        default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91
        help
          Define this to a string that is the name of the block device.


@@ -382,6 +372,8 @@ config ENV_FAT_DEVICE_AND_PART
        depends on ENV_IS_IN_FAT
        default "0:1" if TI_COMMON_CMD_OPTIONS
        default "0:auto" if ARCH_ZYNQMP
        depends on ENV_IS_IN_FAT
        default "0:1" if TI_COMMON_CMD_OPTIONS
        default "0:auto" if ARCH_ZYNQMP

+       default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
+       default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1

        default "0" if ARCH_AT91
        help
          Define this to a string to specify the partition of the device. It can
        default "0" if ARCH_AT91
        help
          Define this to a string to specify the partition of the device. It can


@@ -406,6 +398,38 @@ config ENV_FAT_FILE
          It's a string of the FAT file name. This file use to store the
          environment.
 
          It's a string of the FAT file name. This file use to store the
          environment.
 

+config ENV_EXT4_INTERFACE
+       string "Name of the block device for the environment"
+       depends on ENV_IS_IN_EXT4
+       help
+         Define this to a string that is the name of the block device.
+
+config ENV_EXT4_DEVICE_AND_PART
+       string "Device and partition for where to store the environemt in EXT4"
+       depends on ENV_IS_IN_EXT4
+       help
+         Define this to a string to specify the partition of the device. It can
+         be as following:
+
+           "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
+              - "D:P": device D partition P. Error occurs if device D has no
+                       partition table.
+              - "D:0": device D.
+              - "D" or "D:": device D partition 1 if device D has partition
+                             table, or the whole device D if has no partition
+                             table.
+              - "D:auto": first partition in device D with bootable flag set.
+                          If none, first valid partition in device D. If no
+                          partition table then means device D.
+
+config ENV_EXT4_FILE
+       string "Name of the EXT4 file to use for the environemnt"
+       depends on ENV_IS_IN_EXT4
+       default "uboot.env"
+       help
+         It's a string of the EXT4 file name. This file use to store the
+         environment (explicit path to the file)
+

 if ARCH_SUNXI
 
 config ENV_OFFSET
 if ARCH_SUNXI
 
 config ENV_OFFSET


@@ -437,4 +461,47 @@ 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
+
+config USE_DEFAULT_ENV_FILE
+       bool "Create default environment from file"
+       help
+         Normally, the default environment is automatically generated
+         based on the settings of various CONFIG_* options, as well
+         as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option,
+         you can instead define the entire default environment in an
+         external file.
+
+config DEFAULT_ENV_FILE
+       string "Path to default environment file"
+       depends on USE_DEFAULT_ENV_FILE
+       help
+         The path containing the default environment. The format is
+         the same as accepted by the mkenvimage tool: lines
+         containing key=value pairs, blank lines and lines beginning
+         with # are ignored.
+
+config ENV_VARS_UBOOT_RUNTIME_CONFIG
+       bool "Add run-time information to the environment"
+       help
+         Enable this in order to add variables describing certain
+         run-time determined information about the hardware to the
+         environment.  These will be named board_name, board_rev.
+

 endmenu
 endmenu