Merge tag 'u-boot-imx-20200121' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1e4cf146c5091744b7eab810e4a746a4c51bd42e..b1a1cbcab25ff64a095446f8fdf28bf6192cc750 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -228,6 +228,14 @@ config CMD_LICENSE
        help
          Print GPL license text
 
+config CMD_PMC
+       bool "pmc"
+       help
+         Provides access to the Intel Power-Management Controller (PMC) so
+         that its state can be examined. This does not currently support
+         changing the state but it is still useful for debugging and seeing
+         what is going on.
+
 config CMD_REGINFO
        bool "reginfo"
        depends on PPC
@@ -251,6 +259,13 @@ config CMD_BOOTM
        help
          Boot an application image from the memory.
 
+config BOOTM_EFI
+       bool "Support booting UEFI FIT images"
+       depends on CMD_BOOTEFI && CMD_BOOTM && FIT
+       default y
+       help
+         Support booting UEFI FIT images via the bootm command.
+
 config CMD_BOOTZ
        bool "bootz"
        help
@@ -286,6 +301,7 @@ config BOOTM_OPENRTOS
 
 config BOOTM_OSE
        bool "Support booting Enea OSE images"
+       depends on (ARM && (ARM64 || CPU_V7A || CPU_V7R) || SANDBOX || PPC || X86)
        depends on CMD_BOOTM
        help
          Support booting Enea OSE images via the bootm command.
@@ -348,8 +364,8 @@ config CMD_BOOTMENU
        help
          Add an ANSI terminal boot menu command.
 
-config CMD_DTIMG
-       bool "dtimg"
+config CMD_ADTIMG
+       bool "adtimg"
        help
          Android DTB/DTBO image manipulation commands. Read dtb/dtbo files from
          image into RAM, dump image structure information, etc. Those dtb/dtbo
@@ -842,11 +858,6 @@ config CMD_FASTBOOT
 
          See doc/android/fastboot.txt for more information.
 
-config CMD_FDC
-       bool "fdcboot - Boot from floppy device"
-       help
-         The 'fdtboot' command allows booting an image from a floppy disk.
-
 config CMD_FLASH
        bool "flinfo, erase, protect"
        default y
@@ -1657,6 +1668,13 @@ config CMD_GETTIME
          milliseconds. See also the 'bootstage' command which provides more
          flexibility for boot timing.
 
+config CMD_RNG
+       bool "rng command"
+       depends on DM_RNG
+       select HEXDUMP
+       help
+         Print bytes from the hardware random number generator.
+
 # TODO: rename to CMD_SLEEP
 config CMD_MISC
        bool "sleep"