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

[u-boot] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 46d7034397c1bae8e48f5d7751b39e8325b0db35..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
@@ -128,6 +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