X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Kconfig;h=df8f2946c563963f7ff982f59d3cc8fc114d4f1d;hb=c2f3dade2a8efb90c20b46b3c76a81a15fafe96e;hp=fcde0c35e2c4ee85ece6f982251352dcb3f2feff;hpb=ef84dddd8354bfd7d86ac2411edd3950613b5748;p=platform%2Fkernel%2Fu-boot.git

diff --git a/Kconfig b/Kconfig
index fcde0c3..df8f294 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
@@ -138,6 +145,8 @@ config SYS_MALLOC_F_LEN
 	depends on SYS_MALLOC_F
 	default 0x1000 if AM33XX
 	default 0x2800 if SANDBOX
+	default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
+			   ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
 	default 0x400
 	help
 	  Before relocation, memory is very limited on many platforms. Still,
@@ -155,6 +164,7 @@ config SYS_MALLOC_LEN
 config SPL_SYS_MALLOC_F_LEN
 	hex "Size of malloc() pool in SPL before relocation"
 	depends on SYS_MALLOC_F
+	default 0x2800 if RCAR_GEN3
 	default SYS_MALLOC_F_LEN
 	help
 	  Before relocation, memory is very limited on many platforms. Still,
@@ -240,7 +250,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
@@ -250,6 +260,23 @@ config BUILD_TARGET
 	  special image will be automatically built upon calling
 	  make / buildman.
 
+config SYS_CUSTOM_LDSCRIPT
+	bool "Use a custom location for the U-Boot linker script"
+	help
+	  Normally when linking U-Boot we will look in the board directory,
+	  the CPU directory and finally the "cpu" directory of the architecture
+	  for the ile "u-boot.lds" and use that as our linker.  However, in
+	  some cases we need to provide a different linker script.  To do so,
+	  enable this option and then provide the location under
+	  CONFIG_SYS_LDSCRIPT.
+
+config SYS_LDSCRIPT
+	depends on SYS_CUSTOM_LDSCRIPT
+	string "Custom ldscript location"
+	help
+	  Path within the source tree to the linker script to use for the
+	  main U-Boot binary.
+
 endmenu		# General setup
 
 menu "Boot images"
@@ -388,7 +415,7 @@ config SPL_FIT_SIGNATURE
 	select SPL_RSA
 
 config SPL_LOAD_FIT
-	bool "Enable SPL loading U-Boot as a FIT"
+	bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
 	select SPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part
@@ -399,7 +426,7 @@ config SPL_LOAD_FIT
 	  and passing the correct one to U-Boot.
 
 config SPL_LOAD_FIT_FULL
-	bool "Enable SPL loading U-Boot as a FIT"
+	bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
 	select SPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part