Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index d8e3263f83d78a04ca5c48f1d7815164b0845c2b..dd5a8870017f458d8309194bff1c9623631eb4ca 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -26,6 +26,8 @@ config ARM
 config M68K
        bool "M68000 architecture"
        select HAVE_PRIVATE_LIBGCC
+       select SYS_BOOT_GET_CMDLINE
+       select SYS_BOOT_GET_KBD
 
 config MICROBLAZE
        bool "MicroBlaze architecture"
@@ -53,6 +55,12 @@ config PPC
        bool "PowerPC architecture"
        select HAVE_PRIVATE_LIBGCC
        select SUPPORT_OF_CONTROL
+       select SYS_BOOT_GET_CMDLINE
+       select SYS_BOOT_GET_KBD
+
+config RISCV
+       bool "riscv architecture"
+       select SUPPORT_OF_CONTROL
 
 config SANDBOX
        bool "Sandbox"
@@ -66,6 +74,8 @@ config SANDBOX
        select DM_SPI
        select DM_GPIO
        select DM_MMC
+       select HAVE_BLOCK_DEVICE
+       select SPI
        select LZO
        imply CMD_GETTIME
        imply CMD_HASH
@@ -78,6 +88,7 @@ config SANDBOX
        imply LZMA
        imply SCSI
        imply CMD_SATA
+       imply CMD_SF_TEST
 
 config SH
        bool "SuperH architecture"
@@ -87,18 +98,36 @@ config X86
        bool "x86 architecture"
        select CREATE_ARCH_SYMLINK
        select HAVE_PRIVATE_LIBGCC
+       select USE_PRIVATE_LIBGCC
        select SUPPORT_OF_CONTROL
+       select OF_CONTROL
        select DM
-       select DM_KEYBOARD
-       select DM_SERIAL
-       select DM_GPIO
-       select DM_SPI
-       select DM_SPI_FLASH
-       select USB_EHCI_HCD
+       select DM_PCI
+       select PCI
+       select TIMER
+       select X86_TSC_TIMER
+       imply BLK
+       imply DM_ETH
+       imply DM_GPIO
+       imply DM_KEYBOARD
+       imply DM_MMC
+       imply DM_RTC
+       imply DM_SERIAL
+       imply DM_SCSI
+       imply DM_SPI
+       imply DM_SPI_FLASH
+       imply DM_USB
+       imply DM_VIDEO
        imply CMD_FPGA_LOADMK
        imply CMD_GETTIME
        imply CMD_IO
        imply CMD_IRQ
+       imply CMD_PCI
+       imply CMD_SF_TEST
+       imply CMD_ZBOOT
+       imply USB_HOST_ETHER
+       imply USB_ETHER_ASIX
+       imply USB_ETHER_SMSC95XX
 
 config XTENSA
        bool "Xtensa architecture"
@@ -175,3 +204,4 @@ source "arch/sandbox/Kconfig"
 source "arch/sh/Kconfig"
 source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
+source "arch/riscv/Kconfig"