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

[u-boot] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index bc1d2f31c010f4c95091183356dd9227820fd14a..eb14e08f773d93cbec9ef5812544d22bc7361649 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -601,6 +601,14 @@ config CMD_ARMFLASH
        help
          ARM Ltd reference designs flash partition access
 
+config CMD_ADC
+       bool "adc - Access Analog to Digital Converters info and data"
+       select ADC
+       select DM_REGULATOR
+       help
+         Shows ADC device info and permit printing one-shot analog converted
+         data from a named Analog to Digital Converter.
+
 config CMD_CLK
        bool "clk - Show clock frequencies"
        help
@@ -1103,7 +1111,7 @@ config BOOTP_PXE_CLIENTARCH
 config BOOTP_VCI_STRING
        string
        depends on CMD_BOOTP
-       default "U-Boot.armv7" if CPU_V7 || CPU_V7M
+       default "U-Boot.armv7" if CPU_V7A || CPU_V7M || CPU_V7R
        default "U-Boot.armv8" if ARM64
        default "U-Boot.arm" if ARM
        default "U-Boot"
@@ -1445,6 +1453,20 @@ config CMD_HASH
          saved to memory or to an environment variable. It is also possible
          to verify a hash against data in memory.
 
+config CMD_HVC
+       bool "Support the 'hvc' command"
+       depends on ARM_SMCCC
+       help
+         Allows issuing Hypervisor Calls (HVCs). Mostly useful for
+         development and testing.
+
+config CMD_SMC
+       bool "Support the 'smc' command"
+       depends on ARM_SMCCC
+       help
+         Allows issuing Secure Monitor Calls (SMCs). Mostly useful for
+         development and testing.
+
 config HASH_VERIFY
        bool "hash -v"
        depends on CMD_HASH
@@ -1660,6 +1682,7 @@ config CMD_KGDB
 
 config CMD_LOG
        bool "log - Generation, control and access to logging"
+       select LOG
        help
          This provides access to logging features. It allows the output of
          log data to be controlled to a limited extent (setting up the default