Merge tag 'v2022.04-rc4' into next

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

diff --git a/env/Kconfig b/env/Kconfig
index 24966f8..443f2f7 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -320,6 +320,7 @@ config ENV_IS_IN_SPI_FLASH
        default y if NORTHBRIDGE_INTEL_IVYBRIDGE
        default y if INTEL_QUARK
        default y if INTEL_QUEENSBAY
+       default y if ARCH_SUNXI
        help
          Define this if you have a SPI Flash memory device which you
          want to use for the environment.
@@ -357,54 +358,31 @@ config ENV_SECT_SIZE_AUTO
          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
-       help
-         Force the SPI bus for environment.
-         If not defined, use CONFIG_SF_DEFAULT_BUS.
-
 config ENV_SPI_BUS
        int "Value of SPI flash bus for environment"
-       depends on USE_ENV_SPI_BUS
-       help
-         Value the SPI bus and chip select for environment.
-
-config USE_ENV_SPI_CS
-       bool "SPI flash chip select for environment"
        depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_BUS
        help
-         Force the SPI chip select for environment.
-         If not defined, use CONFIG_SF_DEFAULT_CS.
+         Value the SPI bus and chip select for environment.
 
 config ENV_SPI_CS
        int "Value of SPI flash chip select for environment"
-       depends on USE_ENV_SPI_CS
-       help
-         Value of the SPI chip select for environment.
-
-config USE_ENV_SPI_MAX_HZ
-       bool "SPI flash max frequency for environment"
        depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_CS
        help
-         Force the SPI max work clock for environment.
-         If not defined, use CONFIG_SF_DEFAULT_SPEED.
+         Value of the SPI chip select for environment.
 
 config ENV_SPI_MAX_HZ
        int "Value of SPI flash max frequency for environment"
-       depends on USE_ENV_SPI_MAX_HZ
-       help
-         Value of the SPI max work clock for environment.
-
-config USE_ENV_SPI_MODE
-       bool "SPI flash mode for environment"
        depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_SPEED
        help
-         Force the SPI work mode for environment.
+         Value of the SPI max work clock for environment.
 
 config ENV_SPI_MODE
        hex "Value of SPI flash work mode for environment"
-       depends on USE_ENV_SPI_MODE
+       depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_MODE
        help
          Value of the SPI work mode for environment.
          See include/spi.h for value.
@@ -559,7 +537,7 @@ config ENV_OFFSET
                    ENV_IS_IN_SPI_FLASH
        default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC
        default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH
-       default 0x88000 if ARCH_SUNXI
+       default 0xF0000 if ARCH_SUNXI
        default 0xE0000 if ARCH_ZYNQ
        default 0x1E00000 if ARCH_ZYNQMP
        default 0x7F40000 if ARCH_VERSAL
@@ -582,7 +560,8 @@ config ENV_OFFSET_REDUND
 config ENV_SIZE
        hex "Environment Size"
        default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
-       default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91
+       default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91
+       default 0x10000 if ARCH_SUNXI
        default 0x8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC
        default 0x2000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH
        default 0x8000 if ARCH_ZYNQMP || ARCH_VERSAL
@@ -598,6 +577,7 @@ config ENV_SECT_SIZE
        default 0x40000 if ARCH_ZYNQMP || ARCH_VERSAL
        default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91
        default 0x20000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH
+       default 0x10000 if ARCH_SUNXI && ENV_IS_IN_SPI_FLASH
        help
          Size of the sector containing the environment.
 
@@ -842,6 +822,19 @@ config TPL_ENV_IS_IN_FLASH
 
 endif
 
+config USE_BOOTFILE
+       bool "Add a 'bootfile' environment variable"
+       help
+         The "bootfile" variable is used in some cases to allow for
+         controlling what file U-Boot will attempt to load and boot.  To set
+         this, enable this option and set the value in the next question.
+
+config BOOTFILE
+       string "'bootfile' environment variable value"
+       depends on USE_BOOTFILE
+       help
+         The value to set the "bootfile" variable to.
+
 config VERSION_VARIABLE
        bool "Add a 'ver' environment variable with the U-Boot version"
        help