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

[u-boot] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 2528f50efa73e8e59546a6e00ca7be999fef382f..dd5a8870017f458d8309194bff1c9623631eb4ca 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -23,17 +23,16 @@ config ARM
        select HAVE_PRIVATE_LIBGCC if !ARM64
        select SUPPORT_OF_CONTROL
 
-config AVR32
-       bool "AVR32 architecture"
-       select CREATE_ARCH_SYMLINK
-
 config M68K
        bool "M68000 architecture"
        select HAVE_PRIVATE_LIBGCC
+       select SYS_BOOT_GET_CMDLINE
+       select SYS_BOOT_GET_KBD
 
 config MICROBLAZE
        bool "MicroBlaze architecture"
        select SUPPORT_OF_CONTROL
+       imply CMD_IRQ
 
 config MIPS
        bool "MIPS architecture"
@@ -43,6 +42,7 @@ config MIPS
 
 config NDS32
        bool "NDS32 architecture"
+       select SUPPORT_OF_CONTROL
 
 config NIOS2
        bool "Nios II architecture"
@@ -55,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"
@@ -68,6 +74,21 @@ 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
+       imply CMD_IO
+       imply CMD_IOTRACE
+       imply CMD_LZMADEC
+       imply CRC32_VERIFY
+       imply FAT_WRITE
+       imply HASH_VERIFY
+       imply LZMA
+       imply SCSI
+       imply CMD_SATA
+       imply CMD_SF_TEST
 
 config SH
        bool "SuperH architecture"
@@ -77,15 +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_MMC if MMC
+       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"
@@ -152,7 +194,6 @@ config SYS_CONFIG_NAME
 
 source "arch/arc/Kconfig"
 source "arch/arm/Kconfig"
-source "arch/avr32/Kconfig"
 source "arch/m68k/Kconfig"
 source "arch/microblaze/Kconfig"
 source "arch/mips/Kconfig"
@@ -163,3 +204,4 @@ source "arch/sandbox/Kconfig"
 source "arch/sh/Kconfig"
 source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
+source "arch/riscv/Kconfig"