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

[u-boot] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7f47819e7748004c42477f1dd916088dd300ea47..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
@@ -1035,33 +1043,67 @@ config CMD_BOOTP
        help
          bootp - boot image via network using BOOTP/TFTP protocol
 
+config CMD_DHCP
+       bool "dhcp"
+       depends on CMD_BOOTP
+       help
+         Boot image via network using DHCP/TFTP protocol
+
 config BOOTP_BOOTPATH
-       bool "Enable BOOTP BOOTPATH"
+       bool "Request & store 'rootpath' from BOOTP/DHCP server"
+       default y
        depends on CMD_BOOTP
+       help
+         Even though the config is called BOOTP_BOOTPATH, it stores the
+         path in the variable 'rootpath'.
 
 config BOOTP_DNS
-       bool "Enable bootp DNS"
+       bool "Request & store 'dnsip' from BOOTP/DHCP server"
+       default y
        depends on CMD_BOOTP
+       help
+         The primary DNS server is stored as 'dnsip'. If two servers are
+         returned, you must set BOOTP_DNS2 to store that second server IP
+         also.
+
+config BOOTP_DNS2
+       bool "Store 'dnsip2' from BOOTP/DHCP server"
+       depends on BOOTP_DNS
+       help
+         If a DHCP client requests the DNS server IP from a DHCP server,
+         it is possible that more than one DNS serverip is offered to the
+         client. If CONFIG_BOOTP_DNS2 is enabled, the secondary DNS
+         server IP will be stored in the additional environment
+         variable "dnsip2". The first DNS serverip is always
+         stored in the variable "dnsip", when BOOTP_DNS is defined.
 
 config BOOTP_GATEWAY
-       bool "Enable BOOTP gateway"
+       bool "Request & store 'gatewayip' from BOOTP/DHCP server"
+       default y
        depends on CMD_BOOTP
 
 config BOOTP_HOSTNAME
-       bool "Enable BOOTP hostname"
+       bool "Request & store 'hostname' from BOOTP/DHCP server"
+       default y
        depends on CMD_BOOTP
+       help
+         The name may or may not be qualified with the local domain name.
 
 config BOOTP_SUBNETMASK
-       bool "Enable BOOTP subnetmask"
+       bool "Request & store 'netmask' from BOOTP/DHCP server"
+       default y
        depends on CMD_BOOTP
 
 config BOOTP_PXE
-       bool "Enable BOOTP PXE"
-       depends on CMD_BOOTP
+       bool "Send PXE client arch to BOOTP/DHCP server"
+       default y
+       depends on CMD_BOOTP && CMD_PXE
+       help
+         Supported for ARM, ARM64, and x86 for now.
 
 config BOOTP_PXE_CLIENTARCH
        hex
-       depends on CMD_BOOTP
+       depends on BOOTP_PXE
        default 0x16 if ARM64
        default 0x15 if ARM
        default 0 if X86
@@ -1069,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"
@@ -1108,12 +1150,6 @@ config CMD_RARP
        help
          Boot image via network using RARP/TFTP protocol
 
-config CMD_DHCP
-       bool "dhcp"
-       depends on CMD_BOOTP
-       help
-         Boot image via network using DHCP/TFTP protocol
-
 config CMD_NFS
        bool "nfs"
        default y
@@ -1417,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
@@ -1632,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