Merge tag 'rockchip-for-2019.07' of git://git.denx.de/u-boot-rockchip

[oweals/u-boot.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index e44767113db2f3d27645acd3e3e7da6601375562..2f3d07c13a1817a205f81e7a9792be2c91e75647 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -10,12 +10,12 @@ choice
 
 config ARC
        bool "ARC architecture"
-       select HAVE_PRIVATE_LIBGCC
-       select SUPPORT_OF_CONTROL
        select ARCH_EARLY_INIT_R
+       select ARC_TIMER
        select CLK
+       select HAVE_PRIVATE_LIBGCC
+       select SUPPORT_OF_CONTROL
        select TIMER
-       select ARC_TIMER
 
 config ARM
        bool "ARM architecture"
@@ -23,13 +23,11 @@ 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"
@@ -48,37 +46,79 @@ config NDS32
 
 config NIOS2
        bool "Nios II architecture"
-       select SUPPORT_OF_CONTROL
-       select OF_CONTROL
-       select DM
        select CPU
+       select DM
+       select OF_CONTROL
+       select SUPPORT_OF_CONTROL
+       imply CMD_DM
 
 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 "RISC-V architecture"
+       select CREATE_ARCH_SYMLINK
+       select SUPPORT_OF_CONTROL
+       select OF_CONTROL
+       select DM
+       imply DM_SERIAL
+       imply DM_ETH
+       imply DM_MMC
+       imply DM_SPI
+       imply DM_SPI_FLASH
+       imply BLK
+       imply CLK
+       imply MTD
+       imply TIMER
+       imply CMD_DM
 
 config SANDBOX
        bool "Sandbox"
        select BOARD_LATE_INIT
-       select SUPPORT_OF_CONTROL
        select DM
+       select DM_GPIO
+       select DM_I2C
        select DM_KEYBOARD
-       select DM_SPI_FLASH
+       select DM_MMC
        select DM_SERIAL
-       select DM_I2C
        select DM_SPI
-       select DM_GPIO
-       select DM_MMC
+       select DM_SPI_FLASH
+       select HAVE_BLOCK_DEVICE
+       select LZO
+       select SPI
+       select SUPPORT_OF_CONTROL
+       imply BITREVERSE
+       select BLOBLIST
+       imply CMD_DM
        imply CMD_GETTIME
        imply CMD_HASH
        imply CMD_IO
        imply CMD_IOTRACE
        imply CMD_LZMADEC
+       imply CMD_SATA
+       imply CMD_SF_TEST
        imply CRC32_VERIFY
        imply FAT_WRITE
+       imply FIRMWARE
        imply HASH_VERIFY
        imply LZMA
+       imply SCSI
+       imply TEE
+       imply AVB_VERIFY
+       imply LIBAVB
+       imply CMD_AVB
+       imply UDP_FUNCTION_FASTBOOT
+       imply VIRTIO_MMIO
+       imply VIRTIO_PCI
+       imply VIRTIO_SANDBOX
+       imply VIRTIO_BLK
+       imply VIRTIO_NET
+       imply DM_SOUND
+       imply PCH
 
 config SH
        bool "SuperH architecture"
@@ -87,20 +127,42 @@ config SH
 config X86
        bool "x86 architecture"
        select CREATE_ARCH_SYMLINK
+       select DM
+       select DM_PCI
+       select HAVE_ARCH_IOMAP
        select HAVE_PRIVATE_LIBGCC
+       select OF_CONTROL
+       select PCI
        select SUPPORT_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 TIMER
+       select USE_PRIVATE_LIBGCC
+       select X86_TSC_TIMER
+       imply BLK
+       imply CMD_DM
        imply CMD_FPGA_LOADMK
        imply CMD_GETTIME
        imply CMD_IO
        imply CMD_IRQ
+       imply CMD_PCI
+       imply CMD_SF_TEST
+       imply CMD_ZBOOT
+       imply DM_ETH
+       imply DM_GPIO
+       imply DM_KEYBOARD
+       imply DM_MMC
+       imply DM_RTC
+       imply DM_SCSI
+       imply DM_SERIAL
+       imply DM_SPI
+       imply DM_SPI_FLASH
+       imply DM_USB
+       imply DM_VIDEO
+       imply SYSRESET
+       imply SYSRESET_X86
+       imply USB_ETHER_ASIX
+       imply USB_ETHER_SMSC95XX
+       imply USB_HOST_ETHER
+       imply PCH
 
 config XTENSA
        bool "Xtensa architecture"
@@ -167,7 +229,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"
@@ -178,3 +239,4 @@ source "arch/sandbox/Kconfig"
 source "arch/sh/Kconfig"
 source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
+source "arch/riscv/Kconfig"