ppc: Remove xpedite boards

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

diff --git a/env/Kconfig b/env/Kconfig
index b473d7c..c06b8ba 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -82,10 +82,10 @@ config ENV_IS_IN_FLASH
        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 M548x || M547x || M5282
        default y if MCF532x || MCF52x2
        default y if MPC86xx || MPC83xx
-       default y if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
+       default y if 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
@@ -324,6 +324,20 @@ config ENV_IS_IN_SPI_FLASH
          during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
          aligned to an erase sector boundary.
 
+config ENV_SECT_SIZE_AUTO
+       bool "Use automatically detected sector size"
+       depends on ENV_IS_IN_SPI_FLASH
+       help
+         Some boards exist in multiple variants, with different
+         flashes having different sector sizes. In such cases, you
+         can select this option to make U-Boot use the actual sector
+         size when figuring out how much to erase, which can thus be
+         more efficient on the flashes with smaller erase size. Since
+         the environment must always be aligned on a sector boundary,
+         CONFIG_ENV_OFFSET must be aligned to the largest of the
+         different sector sizes, and CONFIG_ENV_SECT_SIZE should be
+         set to that value.
+
 config USE_ENV_SPI_BUS
        bool "SPI flash bus for environment"
        depends on ENV_IS_IN_SPI_FLASH
@@ -431,7 +445,7 @@ config ENV_FAT_DEVICE_AND_PART
        string "Device and partition for where to store the environemt in FAT"
        depends on ENV_IS_IN_FAT
        default "0:1" if TI_COMMON_CMD_OPTIONS
-       default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP
+       default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
        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
@@ -462,6 +476,14 @@ config ENV_FAT_FILE
          It's a string of the FAT file name. This file use to store the
          environment.
 
+config ENV_FAT_FILE_REDUND
+       string "Name of the FAT file to use for the environment"
+       depends on ENV_IS_IN_FAT && SYS_REDUNDAND_ENVIRONMENT
+       default "uboot-redund.env"
+       help
+         It's a string of the FAT file name. This file use to store the
+         redundant environment.
+
 config ENV_EXT4_INTERFACE
        string "Name of the block device for the environment"
        depends on ENV_IS_IN_EXT4
@@ -534,6 +556,7 @@ config ENV_OFFSET_REDUND
        hex "Redundant environment offset"
        depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \
                    ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT
+       default 0
        help
          Offset from the start of the device (or partition) of the redundant
          environment location.
@@ -647,6 +670,24 @@ config DELAY_ENVIRONMENT
          later by U-Boot code. With CONFIG_OF_CONTROL this is instead
          controlled by the value of /config/load-environment.
 
+config ENV_IMPORT_FDT
+       bool "Amend environment by FDT properties"
+       depends on OF_CONTROL
+       help
+         If selected, after the environment has been loaded from its
+         persistent location, the "env_fdt_path" variable is looked
+         up and used as a path to a node in the control DTB. The
+         property/value pairs in that node is then used to update the
+         run-time environment. This can be useful to use the same
+         U-Boot binary with different board variants.
+
+config ENV_FDT_PATH
+       string "Default value for env_fdt_path variable"
+       depends on ENV_IMPORT_FDT
+       default "/config/environment"
+       help
+         The initial value of the env_fdt_path variable.
+
 config ENV_APPEND
        bool "Always append the environment with new data"
        default n