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

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

diff --git a/arch/Kconfig b/arch/Kconfig
index 854eceb7f80ad9c18e7ee0bf16b2dafeadfbd3af..d04ab9f177c255ae51bdb871421da6203cae438c 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -34,6 +34,7 @@ config M68K
 config MICROBLAZE
        bool "MicroBlaze architecture"
        select SUPPORT_OF_CONTROL
+       imply CMD_IRQ
 
 config MIPS
        bool "MIPS architecture"
@@ -43,6 +44,7 @@ config MIPS
 
 config NDS32
        bool "NDS32 architecture"
+       select SUPPORT_OF_CONTROL
 
 config NIOS2
        bool "Nios II architecture"
@@ -51,9 +53,6 @@ config NIOS2
        select DM
        select CPU
 
-config OPENRISC
-       bool "OpenRISC architecture"
-
 config PPC
        bool "PowerPC architecture"
        select HAVE_PRIVATE_LIBGCC
@@ -71,6 +70,15 @@ config SANDBOX
        select DM_SPI
        select DM_GPIO
        select DM_MMC
+       imply CMD_GETTIME
+       imply CMD_HASH
+       imply CMD_IO
+       imply CMD_IOTRACE
+       imply CMD_LZMADEC
+       imply CRC32_VERIFY
+       imply FAT_WRITE
+       imply HASH_VERIFY
+       imply LZMA
 
 config SH
        bool "SuperH architecture"
@@ -87,6 +95,11 @@ config X86
        select DM_GPIO
        select DM_SPI
        select DM_SPI_FLASH
+       select USB_EHCI_HCD
+       imply CMD_FPGA_LOADMK
+       imply CMD_GETTIME
+       imply CMD_IO
+       imply CMD_IRQ
 
 config XTENSA
        bool "Xtensa architecture"
@@ -159,7 +172,6 @@ source "arch/microblaze/Kconfig"
 source "arch/mips/Kconfig"
 source "arch/nds32/Kconfig"
 source "arch/nios2/Kconfig"
-source "arch/openrisc/Kconfig"
 source "arch/powerpc/Kconfig"
 source "arch/sandbox/Kconfig"
 source "arch/sh/Kconfig"