Merge branch 'master' into next

[thirdparty/u-boot.git] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 6db76e9da8ccd23a2dec6ca0a89e6276b1441b18..bfa12ce12a773a7a68613091095fcb78746069c1 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -333,7 +333,7 @@ config BOOTM_RTEMS
 config CMD_VBE
        bool "vbe - Verified Boot for Embedded"
        depends on BOOTMETH_VBE
-       default y
+       default y if BOOTSTD_FULL
        help
          Provides various subcommands related to VBE, such as listing the
          available methods, looking at the state and changing which method
@@ -1721,7 +1721,7 @@ config CMD_TFTPBOOT
        bool "tftpboot"
        default y
        help
-         tftpboot - boot image via network using TFTP protocol
+         tftpboot - load file via network using TFTP protocol
 
 config CMD_TFTPPUT
        bool "tftp put"