Merge branch 'next'

[platform/kernel/u-boot.git] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 863b7f9..9bf5e86 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -2031,12 +2031,19 @@ config HASH_VERIFY
        help
          Add -v option to verify data against a hash.
 
+config CMD_SCP03
+       bool "scp03 - SCP03 enable and rotate/provision operations"
+       depends on SCP03
+       help
+         This command provides access to a Trusted Application
+         running in a TEE to request Secure Channel Protocol 03
+         (SCP03) enablement and/or rotation of its SCP03 keys.
+
 config CMD_TPM_V1
        bool
 
 config CMD_TPM_V2
        bool
-       select CMD_LOG
 
 config CMD_TPM
        bool "Enable the 'tpm' command"
@@ -2245,6 +2252,15 @@ config CMD_BEDBUG
          for some PowerPC processors. For details please see the
          documentation in doc/README.bedbug.
 
+config CMD_CBSYSINFO
+       bool "cbsysinfo"
+       depends on X86
+       default y if SYS_COREBOOT
+       help
+         This provides information about the coreboot sysinfo table stored in
+         memory by coreboot before jumping to U-Boot. It can be useful for
+         debugging the beaaviour of coreboot or U-Boot.
+
 config CMD_DIAG
        bool "diag - Board diagnostics"
        help