X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Kconfig;h=d8e1aa4eeded267eddf1e81265bf34c8dabae45e;hb=9fcea65bca12775c599168641ec1ae15d088800b;hp=31e75001ff9e694befe873949cdd4055823fa12a;hpb=c3e8aa1a9ed5f6db7345b23a2f8f136e987ebd4d;p=oweals%2Fu-boot.git

diff --git a/Kconfig b/Kconfig
index 31e75001ff..d8e1aa4eed 100644
--- 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.
 
+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
@@ -149,14 +156,15 @@ config SYS_MALLOC_F_LEN
 
 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"
-	depends on SYS_MALLOC_F
+	depends on SYS_MALLOC_F && SPL
 	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"
-	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,
@@ -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"
+	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
@@ -243,7 +252,7 @@ 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.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+	default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || ARCH_SUNXI)
 	default "u-boot.kwb" if KIRKWOOD
 	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
 	help
@@ -337,7 +346,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
-	  CONFIG_IMAGE_FORMAT_LEGACY.
+	  CONFIG_LEGACY_IMAGE_FORMAT.
 
 config FIT_SIGNATURE_MAX_SIZE
 	hex "Max size of signed FIT structures"
@@ -466,7 +475,7 @@ endif # SPL
 
 endif # FIT
 
-config IMAGE_FORMAT_LEGACY
+config LEGACY_IMAGE_FORMAT
 	bool "Enable support for the legacy image format"
 	default y if !FIT_SIGNATURE
 	help