Merge branch 'master' of git://git.denx.de/u-boot-mips

[u-boot] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 436b90fa85cb8c9304b6c9439a5e22856f29c9e2..a77bf1c688affc9f72ebd10ed0df1c2d4f9672dc 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -27,6 +27,51 @@ config HAVE_PRIVATE_LIBGCC
 config LIB_UUID
        bool
 
+config PRINTF
+       bool
+       default y
+
+config SPL_PRINTF
+       bool
+       select SPL_SPRINTF
+       select SPL_STRTO if !USE_TINY_PRINTF
+
+config TPL_PRINTF
+       bool
+       select TPL_SPRINTF
+       select TPL_STRTO if !USE_TINY_PRINTF
+
+config SPRINTF
+       bool
+       default y
+
+config SPL_SPRINTF
+       bool
+
+config TPL_SPRINTF
+       bool
+
+config STRTO
+       bool
+       default y
+
+config SPL_STRTO
+       bool
+
+config TPL_STRTO
+       bool
+
+config IMAGE_SPARSE
+       bool
+
+config IMAGE_SPARSE_FILLBUF_SIZE
+       hex "Android sparse image CHUNK_TYPE_FILL buffer size"
+       default 0x80000
+       depends on IMAGE_SPARSE
+       help
+         Set the size of the fill buffer used when processing CHUNK_TYPE_FILL
+         chunks.
+
 config USE_PRIVATE_LIBGCC
        bool "Use private libgcc"
        depends on HAVE_PRIVATE_LIBGCC
@@ -142,6 +187,20 @@ config TPM
 
 endmenu
 
+menu "Android Verified Boot"
+
+config LIBAVB
+       bool "Android Verified Boot 2.0 support"
+       depends on ANDROID_BOOT_IMAGE
+       default n
+       help
+         This enables support of Android Verified Boot 2.0 which can be used
+         to assure the end user of the integrity of the software running on a
+         device. Introduces such features as boot chain of trust, rollback
+         protection etc.
+
+endmenu
+
 menu "Hashing Support"
 
 config SHA1
@@ -240,6 +299,11 @@ config ERRNO_STR
          - if errno is null or positive number - a pointer to "Success" message
          - if errno is negative - a pointer to errno related message
 
+config HEXDUMP
+       bool "Enable hexdump"
+       help
+         This enables functions for printing dumps of binary data.
+
 config OF_LIBFDT
        bool "Enable the FDT library"
        default y if OF_CONTROL
@@ -252,6 +316,8 @@ config OF_LIBFDT
 
 config OF_LIBFDT_OVERLAY
        bool "Enable the FDT library overlay support"
+       depends on OF_LIBFDT
+       default y if ARCH_OMAP2PLUS || ARCH_KEYSTONE
        help
          This enables the FDT library (libfdt) overlay support.