X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=Kconfig;h=238fa3e1ed46caa14002bd8cb80dfceadea33d89;hb=0d7f1ae0fe6c0d9af2c0208aab4843ec3fdfaf52;hp=286d1c7afcfaf07ef3e99534f480508c84bcf259;hpb=7e0ed13f47b6fcd91e1d536340a7f2d6780ffe48;p=u-boot

diff --git a/Kconfig b/Kconfig
index 286d1c7afc..238fa3e1ed 100644
--- a/Kconfig
+++ b/Kconfig
@@ -96,7 +96,17 @@ config SYS_MALLOC_F_LEN
 	  initial serial device and any others that are needed.
 
 config SPL_SYS_MALLOC_F_LEN
-        hex "Size of malloc() pool in spl before relocation"
+        hex "Size of malloc() pool in SPL before relocation"
+        depends on SYS_MALLOC_F
+        default SYS_MALLOC_F_LEN
+        help
+          Before relocation, memory is very limited on many platforms. Still,
+          we can provide a small malloc() pool if needed. Driver model in
+          particular needs this to operate, so that it can allocate the
+          initial serial device and any others that are needed.
+
+config TPL_SYS_MALLOC_F_LEN
+        hex "Size of malloc() pool in TPL before relocation"
         depends on SYS_MALLOC_F
         default SYS_MALLOC_F_LEN
         help
@@ -152,6 +162,13 @@ endmenu		# General setup
 
 menu "Boot images"
 
+config ANDROID_BOOT_IMAGE
+	bool "Enable support for Android Boot Images"
+	default y if FASTBOOT
+	help
+	  This enables support for booting images which use the Android
+	  image format header.
+
 config FIT
 	bool "Support Flattened Image Tree"
 	select MD5
@@ -370,6 +387,8 @@ source "disk/Kconfig"
 
 source "dts/Kconfig"
 
+source "env/Kconfig"
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"