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

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

diff --git a/common/Kconfig b/common/Kconfig
index b92d0e38366bd3169ee6edece111014f8a8c53ae..9f6a1622d1e1db53552f212924e32857d785a6a8 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"
+       select 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
@@ -561,13 +568,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
@@ -595,6 +609,22 @@ config BOARD_EARLY_INIT_F
          Note that the normal serial console is not yet set up, but the
          debug UART will be available if enabled.
 
+config BOARD_EARLY_INIT_R
+       bool "Call board-specific init after relocation"
+       help
+         Some boards need to perform initialisation as directly after
+         relocation. With this option, U-Boot calls board_early_init_r()
+         in the post-relocation init sequence.
+
+config LAST_STAGE_INIT
+       bool "Call board-specific as last setup step"
+       help
+         Some boards need to perform initialisation immediately before control
+         is passed to the command-line interpreter (e.g. for initializations
+         that depend on later phases in the init sequence). With this option,
+         U-Boot calls last_stage_init() before the command-line interpreter is
+         started.
+
 endmenu
 
 menu "Security support"
@@ -607,6 +637,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"