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 5f2562bbeade423f0a097402504be3bb5dcd98c4..b1a1cbcab25ff64a095446f8fdf28bf6192cc750 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -259,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
@@ -357,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
@@ -851,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
@@ -1666,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"