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

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index 39a4d938d864734b5bc2ad2212937b8da5709e53..e0744d142c77e1d0eabd2aa197514513906212fd 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -57,6 +57,7 @@ config DISTRO_DEFAULTS
        bool "Select defaults suitable for booting general purpose Linux distributions"
        default y if ARCH_SUNXI || TEGRA
        default y if ARCH_LS2080A
+       default y if ARCH_MESON
        default y if ARCH_ROCKCHIP
        default n
        select CMD_BOOTZ if ARM && !ARM64
@@ -69,6 +70,7 @@ config DISTRO_DEFAULTS
        select CMD_FS_GENERIC
        select CMD_MII
        select CMD_PING
+       select CMD_PART
        select HUSH_PARSER
        help
          Select this to enable various options and commands which are suitable
@@ -142,6 +144,7 @@ menu "Boot images"
 
 config FIT
        bool "Support Flattened Image Tree"
+       select MD5
        help
          This option allows you to boot the new uImage structure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
@@ -306,10 +309,14 @@ config ARCH_FIXUP_FDT_MEMORY
 
 endmenu                # Boot images
 
+source "api/Kconfig"
+
 source "common/Kconfig"
 
 source "cmd/Kconfig"
 
+source "disk/Kconfig"
+
 source "dts/Kconfig"
 
 source "net/Kconfig"
@@ -321,3 +328,5 @@ source "fs/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"
+
+source "scripts/Kconfig"