Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index f53ee9d6d79015d001446d41eb2fcc79ae9ccd4b..f96a25f582ba5ead249c4a5209bffde803710b8c 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -243,7 +243,7 @@ config IDENT_STRING
 
 config LOGLEVEL
        int "loglevel"
-       default 6
+       default 4
        range 0 8
        help
          All Messages with a loglevel smaller than the console loglevel will
@@ -403,22 +403,6 @@ config SYS_STDIO_DEREGISTER
 
 endmenu
 
-config DTB_RESELECT
-       bool "Support swapping dtbs at a later point in boot"
-       depends on FIT_EMBED
-       help
-         It is possible during initial boot you may need to use a generic
-         dtb until you can fully determine the board your running on. This
-         config allows boards to implement a function at a later point
-         during boot to switch to the "correct" dtb.
-
-config FIT_EMBED
-       bool "Support a FIT image embedded in the U-boot image"
-       help
-         This option provides hooks to allow U-boot to parse an
-         appended FIT image and enable board specific code to then select
-         the correct DTB to be used.
-
 config DEFAULT_FDT_FILE
        string "Default fdt file"
        help