Merge git://git.denx.de/u-boot-spi

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index 14740b49f1ddbd00530292b13f7d0ad027039949..73f820a6de51cd3d47c531b960f25f28c71d8436 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -162,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
@@ -266,7 +273,7 @@ config SPL_LOAD_FIT
 
 config SPL_FIT_IMAGE_POST_PROCESS
        bool "Enable post-processing of FIT artifacts after loading by the SPL"
-       depends on SPL_LOAD_FIT && TI_SECURE_DEVICE
+       depends on SPL_LOAD_FIT
        help
          Allows doing any sort of manipulation to blobs after they got extracted
          from the U-Boot FIT image like stripping off headers or modifying the
@@ -380,6 +387,8 @@ source "disk/Kconfig"
 
 source "dts/Kconfig"
 
+source "env/Kconfig"
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"
@@ -389,5 +398,3 @@ source "fs/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"
-
-source "scripts/Kconfig"