karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index fd84fa08bd3efc2569ac4200684f26abca5ac205..72f7a07e96e069dc41b4bdbce94b51b963a8cca8 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -53,6 +53,17 @@ config CMD_BOOTM
        help
          Boot an application image from the memory.
 
+config CMD_BOOTZ
+       bool "bootz"
+       default y
+       help
+         Boot a Linux kernel zImage.
+
+config CMD_BOOTCE
+       bool "bootce"
+       help
+         Boot a WindowsCE image.
+
 config CMD_GO
        bool "go"
        default y
@@ -81,6 +92,17 @@ config CMD_XIMG
 
 endmenu
 
+menu "DTB support"
+
+config OF_LIBFDT
+       bool "Enable FDT commands"
+
+config OF_BOARD_SETUP
+       bool "Support DT modifications by board code"
+       depends on OF_LIBFDT
+
+endmenu
+
 menu "Environment commands"
 
 config CMD_EXPORTENV
@@ -107,6 +129,26 @@ config CMD_SAVEENV
 
 endmenu
 
+menu "Environment configuration settings"
+
+choice
+       prompt "Select environment non-volatile storage"
+
+config ENV_IS_NOWHERE
+       bool "do not store environment"
+
+config ENV_IS_IN_NAND
+       bool "store environment in NAND"
+       depends on NAND
+
+config ENV_IS_IN_MMC
+       bool "store environment in MMC"
+       depends on MMC
+
+endchoice
+
+endmenu
+
 menu "Memory commands"
 
 config CMD_MEMORY
@@ -171,11 +213,32 @@ config CMD_FLASH
            erase - FLASH memory
            protect - enable or disable FLASH write protection
 
+config MTD_DEVICE
+       bool "MTD device support"
+
+config CMD_MTDPARTS
+       bool "MTD partitioning support"
+       default y
+       depends on MTD_DEVICE && (CMD_FLASH || CMD_NAND)
+
 config CMD_NAND
        bool "nand"
        help
          NAND support.
 
+config CMD_NAND_TRIMFFS
+       bool "Enable nand write.trimffs command"
+       help
+         Enable command to leave page sized runs of 0xff patterns in
+         erased state rather than overwriting them. This is required
+         for using NAND flash filesystems on NAND controllers with
+         a non-0xff ECC code for all 0xff data.
+
+config CMD_MMC
+       bool "mmc/sd"
+       help
+         MMC/SD support.
+
 config CMD_SPI
        bool "sspi"
        help
@@ -286,6 +349,11 @@ endmenu
 
 menu "Misc commands"
 
+config CMD_CACHE
+       bool "cache control"
+       help
+         Enable commands to switch data cache on/off.
+
 config CMD_TIME
        bool "time"
        help