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

[people/ms/u-boot.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 7ec8c98da2b32ab078f18e0802e82a9d76be45dd..02ca4058d37e0b4e7f23b9885e9cc051d292c0ec 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -14,9 +14,10 @@ config HAVE_PRIVATE_LIBGCC
 config USE_PRIVATE_LIBGCC
        bool "Use private libgcc"
        depends on HAVE_PRIVATE_LIBGCC
+       default y if HAVE_PRIVATE_LIBGCC && ((ARM && !ARM64) || MIPS)
        help
          This option allows you to use the built-in libgcc implementation
-         of U-boot instead of the one privided by the compiler.
+         of U-Boot instead of the one provided by the compiler.
          If unsure, say N.
 
 config SYS_HZ
@@ -27,17 +28,19 @@ config SYS_HZ
          get_timer() must operate in milliseconds and this option must be
          set to 1000.
 
-config SYS_VSNPRINTF
-       bool "Enable safe version of sprintf()"
+config USE_TINY_PRINTF
+       bool "Enable tiny printf() version"
        help
-         Since sprintf() can overflow its buffer, it is common to use
-         snprintf() instead, which knows the buffer size and can avoid
-         overflow. However, this does increase code size slightly (for
-         Thumb-2, about 420 bytes). Enable this option for safety when
-         using sprintf() with data you do not control.
+         This option enables a tiny, stripped down printf version.
+         This should only be used in space limited environments,
+         like SPL versions with hard memory limits. This version
+         reduces the code size by about 2.5KiB on armv7.
+
+         The supported format specifiers are %c, %s, %u/%d and %x.
 
 config REGEX
        bool "Enable regular expression support"
+       default y if NET
        help
          If this variable is defined, U-Boot is linked against the
          SLRE (Super Light Regular Expression) library, which adds
@@ -49,8 +52,21 @@ config LIB_RAND
        help
          This library provides pseudo-random number generator functions.
 
+source lib/dhry/Kconfig
+
 source lib/rsa/Kconfig
 
+config TPM
+       bool "Trusted Platform Module (TPM) Support"
+       depends on DM
+       help
+         This enables support for TPMs which can be used to provide security
+         features for your board. The TPM can be connected via LPC or I2C
+         and a sandbox TPM is provided for testing purposes. Use the 'tpm'
+         command to interactive the TPM. Driver model support is provided
+         for the low-level TPM interface, but only one TPM is supported at
+         a time by the TPM library.
+
 menu "Hashing Support"
 
 config SHA1
@@ -87,6 +103,24 @@ config SHA_PROG_HW_ACCEL
          is performed in hardware.
 endmenu
 
+menu "Compression Support"
+
+config LZ4
+       bool "Enable LZ4 decompression support"
+       help
+         If this option is set, support for LZ4 compressed images
+         is included. The LZ4 algorithm can run in-place as long as the
+         compressed image is loaded to the end of the output buffer, and
+         trades lower compression ratios for much faster decompression.
+         
+         NOTE: This implements the release version of the LZ4 frame
+         format as generated by default by the 'lz4' command line tool.
+         This is not the same as the outdated, less efficient legacy
+         frame format currently (2015) implemented in the Linux kernel
+         (generated by 'lz4 -l'). The two formats are incompatible.
+
+endmenu
+
 config ERRNO_STR
        bool "Enable function for getting errno-related string message"
        help
@@ -95,4 +129,27 @@ 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 OF_LIBFDT
+       bool "Enable the FDT library"
+       default y if OF_CONTROL
+       help
+         This enables the FDT library (libfdt). It provides functions for
+         accessing binary device tree images in memory, such as adding and
+         removing notes and properties, scanning through the tree and finding
+         particular compatible nodes. The library operates on a flattened
+         version of the device tree.
+
+config SPL_OF_LIBFDT
+       bool "Enable the FDT library for SPL"
+       default y if SPL_OF_CONTROL
+       help
+         This enables the FDT library (libfdt). It provides functions for
+         accessing binary device tree images in memory, such as adding and
+         removing notes and properties, scanning through the tree and finding
+         particular compatible nodes. The library operates on a flattened
+         version of the device tree.
+
+source lib/efi/Kconfig
+source lib/efi_loader/Kconfig
+
 endmenu