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

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 07ec03b507b12623aa39ebbee306840b7745d23d..ce81b4c444a36d844263664f98c88c7b81782541 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -116,6 +116,9 @@ endmenu
 
 source "cmd/fastboot/Kconfig"
 
+config BUILD_BIN2C
+       bool
+
 comment "Commands"
 
 menu "Info commands"
@@ -263,7 +266,6 @@ config CMD_IMI
 
 config CMD_IMLS
        bool "imls"
-       default y
        help
          List all images found in flash
 
@@ -528,6 +530,7 @@ menu "Compression commands"
 
 config CMD_LZMADEC
        bool "lzmadec"
+       default y if CMD_BOOTI
        select LZMA
        help
          Support decompressing an LZMA (Lempel-Ziv-Markov chain algorithm)
@@ -535,6 +538,7 @@ config CMD_LZMADEC
 
 config CMD_UNZIP
        bool "unzip"
+       default y if CMD_BOOTI
        help
          Uncompress a zip-compressed memory region.
 
@@ -665,10 +669,17 @@ config CMD_GPT
        bool "GPT (GUID Partition Table) command"
        select PARTITION_UUIDS
        select EFI_PARTITION
+       imply RANDOM_UUID
        help
          Enable the 'gpt' command to ready and write GPT style partition
          tables.
 
+config RANDOM_UUID
+       bool "GPT Random UUID generation"
+       help
+         Enable the generation of partitions with random UUIDs if none
+         are provided.
+
 config CMD_GPT_RENAME
        bool "GPT partition renaming commands"
        depends on CMD_GPT