arm64: zynqmp: Update nand device tree node properties

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 31e75001ff9e694befe873949cdd4055823fa12a..66b059f749a7eeb2dfbd2f6413477b4298444a11 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -20,6 +20,13 @@ config BROKEN
          This option cannot be enabled. It is used as dependency
          for broken and incomplete features.
 
          This option cannot be enabled. It is used as dependency
          for broken and incomplete features.
 

+config DEPRECATED
+       bool
+       help
+         This option cannot be enabled.  It it used as a dependency for
+         code that relies on deprecated features that will be removed and
+         the conversion deadline has passed.
+

 config LOCALVERSION
        string "Local version - append to U-Boot release"
        help
 config LOCALVERSION
        string "Local version - append to U-Boot release"
        help


@@ -149,14 +156,15 @@ config SYS_MALLOC_F_LEN
 
 config SYS_MALLOC_LEN
        hex "Define memory for Dynamic allocation"
 
 config SYS_MALLOC_LEN
        hex "Define memory for Dynamic allocation"

-       depends on ARCH_ZYNQ || ARCH_VERSAL || ARCH_STM32MP
+       depends on ARCH_ZYNQ || ARCH_VERSAL || ARCH_STM32MP || ARCH_ROCKCHIP
+       default 0x2000000 if ARCH_ROCKCHIP

        help
          This defines memory to be allocated for Dynamic allocation
          TODO: Use for other architectures
 
 config SPL_SYS_MALLOC_F_LEN
        hex "Size of malloc() pool in SPL before relocation"
        help
          This defines memory to be allocated for Dynamic allocation
          TODO: Use for other architectures
 
 config SPL_SYS_MALLOC_F_LEN
        hex "Size of malloc() pool in SPL before relocation"

-       depends on SYS_MALLOC_F
+       depends on SYS_MALLOC_F && SPL

        default 0x2800 if RCAR_GEN3
        default SYS_MALLOC_F_LEN
        help
        default 0x2800 if RCAR_GEN3
        default SYS_MALLOC_F_LEN
        help


@@ -167,7 +175,7 @@ config SPL_SYS_MALLOC_F_LEN
 
 config TPL_SYS_MALLOC_F_LEN
        hex "Size of malloc() pool in TPL before relocation"
 
 config TPL_SYS_MALLOC_F_LEN
        hex "Size of malloc() pool in TPL before relocation"

-       depends on SYS_MALLOC_F
+       depends on SYS_MALLOC_F && TPL

        default SYS_MALLOC_F_LEN
        help
          Before relocation, memory is very limited on many platforms. Still,
        default SYS_MALLOC_F_LEN
        help
          Before relocation, memory is very limited on many platforms. Still,


@@ -231,6 +239,7 @@ config SPL_IMAGE
        string "SPL image used in the combined SPL+U-Boot image"
        default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        default "spl/u-boot-spl.bin"
        string "SPL image used in the combined SPL+U-Boot image"
        default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        default "spl/u-boot-spl.bin"

+       depends on SPL

        help
          Select the SPL build target that shall be generated by the SPL
          build process (default spl/u-boot-spl.bin). This image will be
        help
          Select the SPL build target that shall be generated by the SPL
          build process (default spl/u-boot-spl.bin). This image will be


@@ -243,9 +252,11 @@ config BUILD_TARGET
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
        default "u-boot-elf.srec" if RCAR_GEN3
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
        default "u-boot-elf.srec" if RCAR_GEN3

-       default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+       default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || \
+                               ARCH_SUNXI || RISCV)

        default "u-boot.kwb" if KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        default "u-boot.kwb" if KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT

+       default "u-boot-with-spl.imx" if ARCH_MX6 && SPL

        help
          Some SoCs need special image types (e.g. U-Boot binary
          with a special header) as build targets. By defining
        help
          Some SoCs need special image types (e.g. U-Boot binary
          with a special header) as build targets. By defining


@@ -337,7 +348,7 @@ config FIT_SIGNATURE
          check the legacy image format is disabled by default, so that
          unsigned images cannot be loaded. If a board needs the legacy image
          format support in this case, enable it using
          check the legacy image format is disabled by default, so that
          unsigned images cannot be loaded. If a board needs the legacy image
          format support in this case, enable it using

-         CONFIG_IMAGE_FORMAT_LEGACY.
+         CONFIG_LEGACY_IMAGE_FORMAT.

 
 config FIT_SIGNATURE_MAX_SIZE
        hex "Max size of signed FIT structures"
 
 config FIT_SIGNATURE_MAX_SIZE
        hex "Max size of signed FIT structures"


@@ -456,6 +467,7 @@ config SPL_FIT_GENERATOR
        depends on SPL_FIT
        default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
        default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP
        depends on SPL_FIT
        default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
        default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP

+       default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCV

        help
          Specifies a (platform specific) script file to generate the FIT
          source file used to build the U-Boot FIT image file. This gets
        help
          Specifies a (platform specific) script file to generate the FIT
          source file used to build the U-Boot FIT image file. This gets


@@ -466,7 +478,7 @@ endif # SPL
 
 endif # FIT
 
 
 endif # FIT
 

-config IMAGE_FORMAT_LEGACY
+config LEGACY_IMAGE_FORMAT

        bool "Enable support for the legacy image format"
        default y if !FIT_SIGNATURE
        help
        bool "Enable support for the legacy image format"
        default y if !FIT_SIGNATURE
        help