Merge branch 'next' of git://git.denx.de/u-boot-sh

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index faa133da650a05017235c8b34089c60de8ca3c39..157a33081ff144bd3914bc8b3bb0f7f17319c8b4 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -190,6 +190,20 @@ comment "Commands"
 
 menu "Info commands"
 
+config CMD_ACPI
+       bool "acpi"
+       default y if ACPIGEN
+       help
+         List and dump ACPI tables. ACPI (Advanced Configuration and Power
+         Interface) is used mostly on x86 for providing information to the
+         Operating System about devices in the system. The tables are set up
+         by the firmware, typically U-Boot but possibly an earlier firmware
+         module, if U-Boot is chain-loaded from something else. ACPI tables
+         can also include code, to perform hardware-specific tasks required
+         by the Operating Systems. This allows some amount of separation
+         between the firmware and OS, and is particularly useful when you
+         want to make hardware changes without the OS needing to be adjusted.
+
 config CMD_BDI
        bool "bdinfo"
        default y
@@ -770,6 +784,13 @@ config CMD_LZMADEC
          Support decompressing an LZMA (Lempel-Ziv-Markov chain algorithm)
          image from memory.
 
+config CMD_UNLZ4
+       bool "unlz4"
+       default y if CMD_BOOTI
+       select LZ4
+       help
+         Support decompressing an LZ4 image from memory region.
+
 config CMD_UNZIP
        bool "unzip"
        default y if CMD_BOOTI
@@ -1053,21 +1074,34 @@ config CMD_MMC
        help
          MMC memory mapped support.
 
+if CMD_MMC
+
+config CMD_BKOPS_ENABLE
+       bool "mmc bkops enable"
+       depends on CMD_MMC
+       default n
+       help
+         Enable command for setting manual background operations handshake
+         on a eMMC device. The feature is optionally available on eMMC devices
+         conforming to standard >= 4.41.
+
 config CMD_MMC_RPMB
        bool "Enable support for RPMB in the mmc command"
-       depends on CMD_MMC
+       depends on SUPPORT_EMMC_RPMB
        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
+       depends on MMC_WRITE
        select IMAGE_SPARSE
        help
          Enable support for the "mmc swrite" command to write Android sparse
          images to eMMC.
 
+endif
+
 config CMD_MTD
        bool "mtd"
        depends on MTD
@@ -1600,15 +1634,6 @@ config CMD_BSP
          option provides a way to control this. The commands that are enabled
          vary depending on the board.
 
-config CMD_BKOPS_ENABLE
-       bool "mmc bkops enable"
-       depends on CMD_MMC
-       default n
-       help
-         Enable command for setting manual background operations handshake
-         on a eMMC device. The feature is optionally available on eMMC devices
-         conforming to standard >= 4.41.
-
 config CMD_BLOCK_CACHE
        bool "blkcache - control and stats for block cache"
        depends on BLOCK_CACHE
@@ -2096,7 +2121,7 @@ config CMD_BEDBUG
        help
          The bedbug (emBEDded deBUGger) command provides debugging features
          for some PowerPC processors. For details please see the
-         docuemntation in doc/README.beddbug
+         documentation in doc/README.bedbug.
 
 config CMD_DIAG
        bool "diag - Board diagnostics"
@@ -2173,6 +2198,14 @@ config CMD_UBI
          It is also strongly encouraged to also enable CONFIG_MTD to get full
          partition support.
 
+config CMD_UBI_RENAME
+       bool "Enable rename"
+       depends on CMD_UBI
+       default n
+       help
+         Enable a "ubi" command to rename ubi volume:
+          ubi rename <oldname> <newname>
+
 config CMD_UBIFS
        tristate "Enable UBIFS - Unsorted block images filesystem commands"
        depends on CMD_UBI