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

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4fa52299ef63e7c819a4a3154e3740096106113a..9bd6cf1d807d1e793b885bacc3a05a10483b9d93 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -516,14 +516,16 @@ config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
        select CMD_USB
        select DM
-       select DM_GPIO
        select DM_ETH
+       select DM_GPIO
+       select DM_KEYBOARD
        select DM_SERIAL
        select DM_USB
        select OF_CONTROL
        select OF_SEPARATE
        select SPL_STACK_R if !MACH_SUN9I
        select SPL_SYS_MALLOC_SIMPLE if !MACH_SUN9I
+       select SYS_NS16550
        select USB
        select USB_STORAGE
        select USB_KEYBOARD
@@ -551,7 +553,9 @@ config ARCH_ZYNQ
        select OF_CONTROL
        select SPL_OF_CONTROL
        select DM
+       select DM_ETH
        select SPL_DM
+       select DM_MMC
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
@@ -562,6 +566,8 @@ config ARCH_ZYNQMP
        select ARM64
        select DM
        select OF_CONTROL
+       select DM_ETH
+       select DM_MMC
        select DM_SERIAL
 
 config TEGRA
@@ -650,6 +656,14 @@ config TARGET_LS1021ATWR
        select CPU_V7
        select SUPPORT_SPL
 
+config TARGET_LS1043AQDS
+       bool "Support ls1043aqds"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS1043AQDS platform.
+
 config TARGET_LS1043ARDB
        bool "Support ls1043ardb"
        select ARM64
@@ -684,6 +698,8 @@ config ARCH_UNIPHIER
 config TARGET_STM32F429_DISCOVERY
        bool "Support STM32F429 Discovery"
        select CPU_V7M
+       select DM
+       select DM_SERIAL
 
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
@@ -731,7 +747,7 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/mach-rockchip/Kconfig"
 
-source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
+source "arch/arm/mach-s5pc1xx/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"
 
@@ -773,6 +789,7 @@ source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
 source "board/freescale/ls2080ardb/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
+source "board/freescale/ls1043aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/ls1043ardb/Kconfig"
 source "board/freescale/mx23evk/Kconfig"