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

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 83dc778..676011d 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -397,6 +397,7 @@ menu "Memory commands"
 config CMD_CRC32
        bool "crc32"
        select HASH
+       default n if ARCH_SUNXI
        default y
        help
          Compute CRC32.
@@ -538,6 +539,7 @@ 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.
@@ -746,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
@@ -1134,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
@@ -1184,6 +1189,8 @@ config CMD_UUID
 
 endmenu
 
+source "cmd/ti/Kconfig"
+
 config CMD_BOOTSTAGE
        bool "Enable the 'bootstage' command"
        depends on BOOTSTAGE
@@ -1365,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