spl: fix debug print in spl_common_init()

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

diff --git a/common/Kconfig b/common/Kconfig
index 5c90ce4629f7b4610da578964b4cca2e19283bbb..b3d9b37463565d6cecf01e08d8572b5b2ae39ae8 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -125,6 +125,7 @@ config NOR_BOOT
 config NAND_BOOT
        bool "Support for booting from NAND flash"
        default n
+       imply NAND
        help
          Enabling this will make a U-Boot binary that is capable of being
          booted via NAND flash. This is not a must, some SoCs need this,
@@ -133,6 +134,7 @@ config NAND_BOOT
 config ONENAND_BOOT
        bool "Support for booting from ONENAND"
        default n
+       imply NAND
        help
          Enabling this will make a U-Boot binary that is capable of being
          booted via ONENAND. This is not a must, some SoCs need this,
@@ -182,6 +184,10 @@ config BOOTDELAY
          set to -1 to disable autoboot.
          set to -2 to autoboot with no delay and not check for abort
 
+         If this value is >= 0 then it is also used for the default delay
+         before starting the default entry in bootmenu. If it is < 0 then
+         a default value of 10s is used.
+
          See doc/README.autoboot for details.
 
 config USE_BOOTARGS
@@ -424,6 +430,7 @@ menu "Logging"
 
 config LOG
        bool "Enable logging support"
+       depends on DM
        help
          This enables support for logging of status and debug messages. These
          can be displayed on the console, recorded in a memory buffer, or
@@ -532,6 +539,13 @@ config DEFAULT_FDT_FILE
        help
          This option is used to set the default fdt file to boot OS.
 
+config MISC_INIT_R
+       bool "Execute Misc Init"
+       default y if ARCH_KEYSTONE || ARCH_SUNXI || MPC85xx
+       default y if ARCH_OMAP2PLUS && !AM33XX
+       help
+         Enabling this option calls 'misc_init_r' function
+
 config VERSION_VARIABLE
        bool "add U-Boot environment variable vers"
        default n
@@ -561,13 +575,20 @@ config DISPLAY_CPUINFO
          to do this.
 
 config DISPLAY_BOARDINFO
-       bool "Display information about the board during start up"
+       bool "Display information about the board during early start up"
        default y if ARM || M68K || MIPS || PPC || SANDBOX || XTENSA
        help
          Display information about the board that U-Boot is running on
          when U-Boot starts up. The board function checkboard() is called
          to do this.
 
+config DISPLAY_BOARDINFO_LATE
+       bool "Display information about the board during late start up"
+       help
+         Display information about the board that U-Boot is running on after
+         the relocation phase. The board function checkboard() is called to do
+         this.
+
 menu "Start-up hooks"
 
 config ARCH_EARLY_INIT_R
@@ -623,6 +644,16 @@ config HASH
          and the algorithms it supports are defined in common/hash.c. See
          also CMD_HASH for command-line access.
 
+config AVB_VERIFY
+       bool "Build Android Verified Boot operations"
+       depends on LIBAVB && FASTBOOT
+       help
+         This option enables compilation of bootloader-dependent operations,
+         used by Android Verified Boot 2.0 library (libavb). Includes:
+           * Helpers to process strings in order to build OS bootargs.
+           * Helpers to access MMC, similar to drivers/fastboot/fb_mmc.c.
+           * Helpers to alloc/init/free avb ops.
+
 endmenu
 
 menu "Update support"