Merge git://git.denx.de/u-boot-usb

[platform/kernel/u-boot.git] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 28c91ca..676011d 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
 
@@ -395,6 +397,7 @@ menu "Memory commands"
 config CMD_CRC32
        bool "crc32"
        select HASH
+       default n if ARCH_SUNXI
        default y
        help
          Compute CRC32.
@@ -528,6 +531,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 +539,8 @@ config CMD_LZMADEC
 
 config CMD_UNZIP
        bool "unzip"
+       default n if ARCH_SUNXI
+       default y if CMD_BOOTI
        help
          Uncompress a zip-compressed memory region.
 
@@ -742,12 +748,14 @@ config CMD_I2C
 
 config CMD_LOADB
        bool "loadb"
+       default n if ARCH_SUNXI
        default y
        help
          Load a binary file over serial line.
 
 config CMD_LOADS
        bool "loads"
+       default n if ARCH_SUNXI
        default y
        help
          Load an S-Record file over serial line
@@ -910,6 +918,14 @@ config CMD_USB_SDP
        help
          Enables the command "sdp" which is used to have U-Boot emulating the
          Serial Download Protocol (SDP) via USB.
+config CMD_ROCKUSB
+       bool "rockusb"
+       depends on USB_FUNCTION_ROCKUSB
+       help
+          Rockusb protocol is widely used by Rockchip SoC based devices. It can
+         read/write info, image to/from devices. This enable rockusb command
+         support to communication with rockusb device. for more detail about
+         this command, please read doc/README.rockusb.
 
 config CMD_USB_MASS_STORAGE
        bool "UMS usb mass storage"
@@ -1122,6 +1138,7 @@ config CMD_GETTIME
 # TODO: rename to CMD_SLEEP
 config CMD_MISC
        bool "sleep"
+       default n if ARCH_SUNXI
        default y
        help
          Delay execution for some time
@@ -1172,6 +1189,8 @@ config CMD_UUID
 
 endmenu
 
+source "cmd/ti/Kconfig"
+
 config CMD_BOOTSTAGE
        bool "Enable the 'bootstage' command"
        depends on BOOTSTAGE
@@ -1353,17 +1372,20 @@ config CMD_CRAMFS
 
 config CMD_EXT2
        bool "ext2 command support"
+       select FS_EXT4
        help
          Enables EXT2 FS command
 
 config CMD_EXT4
        bool "ext4 command support"
+       select FS_EXT4
        help
          Enables EXT4 FS command
 
 config CMD_EXT4_WRITE
        depends on CMD_EXT4
        bool "ext4 write command support"
+       select EXT4_WRITE
        help
          Enables EXT4 FS write command
 
@@ -1400,13 +1422,14 @@ config CMD_MTDPARTS
 
 config MTDIDS_DEFAULT
        string "Default MTD IDs"
-       depends on CMD_MTDPARTS
+       depends on CMD_MTDPARTS || CMD_NAND || CMD_FLASH
        help
-         Defines a default MTD ID
+         Defines a default MTD IDs list for use with MTD partitions in the
+         Linux MTD command line partitions format.
 
 config MTDPARTS_DEFAULT
        string "Default MTD partition scheme"
-       depends on CMD_MTDPARTS
+       depends on CMD_MTDPARTS || CMD_NAND || CMD_FLASH
        help
          Defines a default MTD partitioning scheme in the Linux MTD command
          line partitions format
@@ -1497,6 +1520,14 @@ config CMD_KGDB
          single-stepping, inspecting variables, etc. This is supported only
          on PowerPC at present.
 
+config CMD_LOG
+       bool "log - Generation, control and access to logging"
+       help
+         This provides access to logging features. It allows the output of
+         log data to be controlled to a limited extent (setting up the default
+         maximum log level for emitting of records). It also provides access
+         to a command used for testing the log system.
+
 config CMD_TRACE
        bool "trace - Support tracing of function calls and timing"
        help