Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7ed3c9c3b30bd90424a3c43ebb18246bb283ff0d..3ea42e4256119025d6f3a2948d5b3b70b1be9c4b 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -226,7 +226,7 @@ config CMD_BOOTEFI
 
 config CMD_BOOTEFI_HELLO_COMPILE
        bool "Compile a standard EFI hello world binary for testing"
-       depends on CMD_BOOTEFI && (ARM || X86 || RISCV)
+       depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX
        default y
        help
          This compiles a standard EFI hello world application with U-Boot so
@@ -445,6 +445,7 @@ config CRC32_VERIFY
 
 config CMD_EEPROM
        bool "eeprom - EEPROM subsystem"
+       depends on !DM_I2C || DM_I2C_COMPAT
        help
          (deprecated, needs conversion to driver model)
          Provides commands to read and write EEPROM (Electrically Erasable
@@ -953,6 +954,14 @@ config CMD_PCMCIA
          about 1990. These devices are typically removable memory or network
          cards using a standard 68-pin connector.
 
+config CMD_PINMUX
+       bool "pinmux - show pins muxing"
+       default y if PINCTRL
+       help
+         Parse all available pin-controllers and show pins muxing. This
+         is useful for debug purpoer to check the pin muxing and to know if
+         a pin is configured as a GPIO or as an alternate function.
+
 config CMD_POWEROFF
        bool "poweroff"
        help
@@ -1065,6 +1074,13 @@ config CMD_USB_MASS_STORAGE
        help
          USB mass storage support
 
+config CMD_VIRTIO
+       bool "virtio"
+       depends on VIRTIO
+       default y if VIRTIO
+       help
+         VirtIO block device support
+
 config CMD_AXI
        bool "axi"
        depends on AXI
@@ -1365,6 +1381,14 @@ config CMD_CONITRACE
          Enable the 'conitrace' command which displays the codes received
          from the console input as hexadecimal numbers.
 
+config CMD_CLS
+       bool "Enable clear screen command 'cls'"
+       depends on CFB_CONSOLE || DM_VIDEO || LCD || VIDEO
+       default y if LCD
+       help
+         Enable the 'cls' command which clears the screen contents
+         on video frame buffer.
+
 config CMD_DISPLAY
        bool "Enable the 'display' command, for character displays"
        help
@@ -1728,14 +1752,14 @@ config CMD_MTDPARTS
 
 config MTDIDS_DEFAULT
        string "Default MTD IDs"
-       depends on CMD_MTD || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
+       depends on MTD_PARTITIONS || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
        help
          Defines a default MTD IDs list for use with MTD partitions in the
          Linux MTD command line partitions format.
 
 config MTDPARTS_DEFAULT
        string "Default MTD partition scheme"
-       depends on CMD_MTD || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
+       depends on MTD_PARTITIONS || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
        help
          Defines a default MTD partitioning scheme in the Linux MTD command
          line partitions format
@@ -1811,6 +1835,7 @@ config CMD_IRQ
 
 config CMD_KGDB
        bool "kgdb - Allow debugging of U-Boot with gdb"
+       depends on PPC
        help
          This enables a 'kgdb' command which allows gdb to connect to U-Boot
          over a serial link for debugging purposes. This allows
@@ -1855,7 +1880,6 @@ endmenu
 
 config CMD_UBI
        tristate "Enable UBI - Unsorted block images commands"
-       select CMD_MTDPARTS
        select CRC32
        select MTD_UBI
        help