Merge git://git.denx.de/u-boot-fsl-qoriq

[people/ms/u-boot.git] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 2a2f23e2518bcb4a185cbed8697513a776bd3bb4..4a0d489696898e20586893e989fe0f7fc62ea00d 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -181,15 +181,34 @@ config CMD_BOOTEFI
        help
          Boot an EFI image from memory.
 
+config CMD_BOOTEFI_HELLO_COMPILE
+       bool "Compile a standard EFI hello world binary for testing"
+       depends on CMD_BOOTEFI && (ARM || X86)
+       default y
+       help
+         This compiles a standard EFI hello world application with U-Boot so
+         that it can be used with the test/py testing framework. This is useful
+         for testing that EFI is working at a basic level, and for bringing
+         up EFI support on a new architecture.
+
+         No additional space will be required in the resulting U-Boot binary
+         when this option is enabled.
+
 config CMD_BOOTEFI_HELLO
        bool "Allow booting a standard EFI hello world for testing"
-       depends on CMD_BOOTEFI && (ARM || X86)
+       depends on CMD_BOOTEFI_HELLO_COMPILE
        help
          This adds a standard EFI hello world application to U-Boot so that
          it can be used with the 'bootefi hello' command. This is useful
          for testing that EFI is working at a basic level, and for bringing
          up EFI support on a new architecture.
 
+config CMD_BOOTMENU
+       bool "bootmenu"
+       select MENU
+       help
+         Add an ANSI terminal boot menu command.
+
 config CMD_ELF
        bool "bootelf, bootvx"
        default y
@@ -290,7 +309,7 @@ config CMD_MEMORY
        bool "md, mm, nm, mw, cp, cmp, base, loop"
        default y
        help
-         Memeory commands.
+         Memory commands.
            md - memory display
            mm - memory modify (auto-incrementing address)
            nm - memory modify (constant address)
@@ -298,7 +317,7 @@ config CMD_MEMORY
            cp - memory copy
            cmp - memory compare
            base - print or set address offset
-           loop - initinite loop on address range
+           loop - initialize loop on address range
 
 config CMD_CRC32
        bool "crc32"
@@ -375,6 +394,14 @@ config CMD_FLASH
            erase - FLASH memory
            protect - enable or disable FLASH write protection
 
+config CMD_GPT
+       bool "GPT (GUID Partition Table) command"
+       select PARTITION_UUIDS
+       select EFI_PARTITION
+       help
+         Enable the 'gpt' command to ready and write GPT style partition
+         tables.
+
 config CMD_ARMFLASH
        #depends on FLASH_CFI_DRIVER
        bool "armflash"
@@ -391,6 +418,13 @@ config CMD_NAND
        help
          NAND support.
 
+config CMD_PART
+       bool "part"
+       select PARTITION_UUIDS
+       help
+         Read and display information about the partition table on
+         various media.
+
 config CMD_SF
        bool "sf"
        help
@@ -505,6 +539,12 @@ config CMD_DHCP
        help
          Boot image via network using DHCP/TFTP protocol
 
+config CMD_PXE
+       bool "pxe"
+       select MENU
+       help
+         Boot image via network using PXE protocol
+
 config CMD_NFS
        bool "nfs"
        default y
@@ -559,6 +599,15 @@ config SYS_AMBAPP_PRINT_ON_STARTUP
        help
          Show AMBA Plug-n-Play information on startup.
 
+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
@@ -619,6 +668,9 @@ config CMD_QFW
          This provides access to the QEMU firmware interface.  The main
          feature is to allow easy loading of files passed to qemu-system
          via -kernel / -initrd
+
+source "cmd/mvebu/Kconfig"
+
 endmenu
 
 config CMD_BOOTSTAGE