Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 225bb002a67cbd1466b6d0803a47b591066b7478..2fa0829925c1b9f290d982fbbc1a008a7dcdc2ba 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -137,8 +137,6 @@ config AUTOBOOT_STOP_STR_SHA256
 
 endmenu
 
 
 endmenu
 

-source "cmd/fastboot/Kconfig"
-

 config BUILD_BIN2C
        bool
 
 config BUILD_BIN2C
        bool
 


@@ -228,7 +226,7 @@ config CMD_BOOTEFI
 
 config CMD_BOOTEFI_HELLO_COMPILE
        bool "Compile a standard EFI hello world binary for testing"
 
 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
        default y
        help
          This compiles a standard EFI hello world application with U-Boot so


@@ -601,6 +599,14 @@ config CMD_ARMFLASH
        help
          ARM Ltd reference designs flash partition access
 
        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
 config CMD_CLK
        bool "clk - Show clock frequencies"
        help


@@ -642,6 +648,18 @@ config CMD_DM
          can be useful to see the state of driver model for debugging or
          interest.
 
          can be useful to see the state of driver model for debugging or
          interest.
 

+config CMD_FASTBOOT
+       bool "fastboot - Android fastboot support"
+       depends on FASTBOOT
+       help
+         This enables the command "fastboot" which enables the Android
+         fastboot mode for the platform. Fastboot is a protocol for
+         downloading images, flashing and device control used on
+         Android devices. Fastboot requires either the network stack
+         enabled or support for acting as a USB device.
+
+         See doc/README.android-fastboot for more information.
+

 config CMD_FDC
        bool "fdcboot - Boot from floppy device"
        help
 config CMD_FDC
        bool "fdcboot - Boot from floppy device"
        help


@@ -689,6 +707,13 @@ config CMD_FPGA_LOADP
          Supports loading an FPGA device from a bitstream buffer containing
          a partial bitstream.
 
          Supports loading an FPGA device from a bitstream buffer containing
          a partial bitstream.
 

+config CMD_FPGA_LOAD_SECURE
+       bool "fpga loads - loads secure bitstreams (Xilinx only)"
+       depends on CMD_FPGA
+       help
+         Enables the fpga loads command which is used to load secure
+         (authenticated or encrypted or both) bitstreams on to FPGA.
+

 config CMD_FPGAD
        bool "fpgad - dump FPGA registers"
        help
 config CMD_FPGAD
        bool "fpgad - dump FPGA registers"
        help


@@ -808,6 +833,21 @@ config CMD_MMC
        help
          MMC memory mapped support.
 
        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_MMC_SWRITE
+       bool "mmc swrite"
+       depends on CMD_MMC && MMC_WRITE
+       select IMAGE_SPARSE
+       help
+         Enable support for the "mmc swrite" command to write Android sparse
+         images to eMMC.
+

 config CMD_NAND
        bool "nand"
        default y if NAND_SUNXI
 config CMD_NAND
        bool "nand"
        default y if NAND_SUNXI


@@ -1081,11 +1121,25 @@ config BOOTP_HOSTNAME
        help
          The name may or may not be qualified with the local domain name.
 
        help
          The name may or may not be qualified with the local domain name.
 

+config BOOTP_PREFER_SERVERIP
+       bool "serverip variable takes precedent over DHCP server IP."
+       depends on CMD_BOOTP
+       help
+         By default a BOOTP/DHCP reply will overwrite the 'serverip' variable.
+
+         With this option enabled, the 'serverip' variable in the environment
+         takes precedence over DHCP server IP and will only be set by the DHCP
+         server if not already set in the environment.
+

 config BOOTP_SUBNETMASK
        bool "Request & store 'netmask' from BOOTP/DHCP server"
        default y
        depends on CMD_BOOTP
 
 config BOOTP_SUBNETMASK
        bool "Request & store 'netmask' from BOOTP/DHCP server"
        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
 config BOOTP_PXE
        bool "Send PXE client arch to BOOTP/DHCP server"
        default y


@@ -1103,7 +1157,7 @@ config BOOTP_PXE_CLIENTARCH
 config BOOTP_VCI_STRING
        string
        depends on CMD_BOOTP
 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"
        default "U-Boot.armv8" if ARM64
        default "U-Boot.arm" if ARM
        default "U-Boot"


@@ -1175,6 +1229,7 @@ config CMD_DNS
 
 config CMD_LINK_LOCAL
        bool "linklocal"
 
 config CMD_LINK_LOCAL
        bool "linklocal"

+       select LIB_RAND

        help
          Acquire a network IP address using the link-local protocol
 
        help
          Acquire a network IP address using the link-local protocol
 


@@ -1194,6 +1249,11 @@ config CMD_PXE
        help
          Boot image via network using PXE protocol
 
        help
          Boot image via network using PXE protocol
 

+config CMD_WOL
+       bool "wol"
+       help
+         Wait for wake-on-lan Magic Packet
+

 endif
 
 menu "Misc commands"
 endif
 
 menu "Misc commands"


@@ -1210,6 +1270,13 @@ config CMD_BMP
          the image into RAM, then using this command to look at it or display
          it.
 
          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
 config CMD_BSP
        bool "Enable board-specific commands"
        help


@@ -1289,6 +1356,13 @@ config CMD_MISC
        help
          Delay execution for some time
 
        help
          Delay execution for some time
 

+config MP
+       bool "support for multiprocessor"
+       help
+         This provides an option to brinup
+         different processors in multiprocessor
+         cases.
+

 config CMD_TIMER
        bool "timer"
        help
 config CMD_TIMER
        bool "timer"
        help


@@ -1445,31 +1519,57 @@ config CMD_HASH
          saved to memory or to an environment variable. It is also possible
          to verify a hash against data in memory.
 
          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
        help
          Add -v option to verify data against a hash.
 
 config HASH_VERIFY
        bool "hash -v"
        depends on CMD_HASH
        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"
 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.
 
        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"
 config CMD_TPM_TEST
        bool "Enable the 'tpm test' command"

-       depends on CMD_TPM
+       depends on TPM_V1

        help
        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.
 
          for other devices.
 

+endif
+

 endmenu
 
 menu "Firmware commands"
 endmenu
 
 menu "Firmware commands"


@@ -1676,6 +1776,22 @@ config CMD_TRACE
          for analsys (e.g. using bootchart). See doc/README.trace for full
          details.
 
          for analsys (e.g. using bootchart). See doc/README.trace for full
          details.
 

+config CMD_AVB
+       bool "avb - Android Verified Boot 2.0 operations"
+       depends on LIBAVB
+       default n
+       help
+         Enables a "avb" command to perform verification of partitions using
+         Android Verified Boot 2.0 functionality. It includes such subcommands:
+           avb init - initialize avb2 subsystem
+           avb read_rb - read rollback index
+           avb write_rb - write rollback index
+           avb is_unlocked - check device lock state
+           avb get_uuid - read and print uuid of a partition
+           avb read_part - read data from partition
+           avb read_part_hex - read data from partition and output to stdout
+           avb write_part - write data to partition
+           avb verify - run full verification chain

 endmenu
 
 config CMD_UBI
 endmenu
 
 config CMD_UBI