Merge git://git.denx.de/u-boot-riscv

[u-boot] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index eb14e08f773d93cbec9ef5812544d22bc7361649..1a1ca60237dfe672f5a89ce00cf601a096a1a647 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -228,7 +228,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)
+       depends on CMD_BOOTEFI && (ARM || X86 || RISCV)
        default y
        help
          This compiles a standard EFI hello world application with U-Boot so
@@ -816,6 +816,13 @@ config CMD_MMC
        help
          MMC memory mapped support.
 
+config CMD_MMC_RPMB
+       bool "Enable support for RPMB in the mmc command"
+       depends on CMD_MMC
+       help
+         Enable the commands for reading, writing and programming the
+         key for the Replay Protection Memory Block partition in eMMC.
+
 config CMD_NAND
        bool "nand"
        default y if NAND_SUNXI
@@ -1094,6 +1101,10 @@ config BOOTP_SUBNETMASK
        default y
        depends on CMD_BOOTP
 
+config BOOTP_NTPSERVER
+       bool "Request & store 'ntpserverip' from BOOTP/DHCP server"
+       depends on CMD_BOOTP
+
 config BOOTP_PXE
        bool "Send PXE client arch to BOOTP/DHCP server"
        default y
@@ -1218,6 +1229,13 @@ config CMD_BMP
          the image into RAM, then using this command to look at it or display
          it.
 
+config CMD_BOOTCOUNT
+       bool "bootcount"
+       depends on BOOTCOUNT_LIMIT
+       help
+         Enable the bootcount command, which allows interrogation and
+         reset of the bootcounter.
+
 config CMD_BSP
        bool "Enable board-specific commands"
        help
@@ -1473,25 +1491,37 @@ config HASH_VERIFY
        help
          Add -v option to verify data against a hash.
 
+config CMD_TPM_V1
+       bool
+
+config CMD_TPM_V2
+       bool
+
 config CMD_TPM
        bool "Enable the 'tpm' command"
-       depends on TPM
+       depends on TPM_V1 || TPM_V2
+       select CMD_TPM_V1 if TPM_V1
+       select CMD_TPM_V2 if TPM_V2
        help
          This provides a means to talk to a TPM from the command line. A wide
          range of commands if provided - see 'tpm help' for details. The
          command requires a suitable TPM on your board and the correct driver
          must be enabled.
 
+if CMD_TPM
+
 config CMD_TPM_TEST
        bool "Enable the 'tpm test' command"
-       depends on CMD_TPM
+       depends on TPM_V1
        help
-         This provides a a series of tests to confirm that the TPM is working
-         correctly. The tests cover initialisation, non-volatile RAM, extend,
-         global lock and checking that timing is within expectations. The
-         tests pass correctly on Infineon TPMs but may need to be adjusted
+         This provides a a series of tests to confirm that the TPMv1.x is
+         working correctly. The tests cover initialisation, non-volatile RAM,
+         extend, global lock and checking that timing is within expectations.
+         The tests pass correctly on Infineon TPMs but may need to be adjusted
          for other devices.
 
+endif
+
 endmenu
 
 menu "Firmware commands"