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

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8a9cfcca7ef0ce603ebb6cdc95ebd38ced2c454a..6de734f8f20f04b604294d45bc3f68bfbc89e513 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -304,13 +304,13 @@ config TARGET_VEXPRESS_CA9X4
        bool "Support vexpress_ca9x4"
        select CPU_V7
 
-config TARGET_KWB
-       bool "Support kwb"
+config TARGET_BRXRE1
+       bool "Support BRXRE1"
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_TSERIES
-       bool "Support tseries"
+config TARGET_BRPPT1
+       bool "Support BRPPT1"
        select CPU_V7
        select SUPPORT_SPL
 
@@ -610,16 +610,8 @@ config TARGET_CM_T43
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
-       select CMD_BOOTZ
-       select CMD_DHCP
-       select CMD_EXT2
-       select CMD_EXT4
-       select CMD_FAT
-       select CMD_FS_GENERIC
        select CMD_GPIO
-       select CMD_MII
        select CMD_MMC if MMC
-       select CMD_PING
        select CMD_USB
        select DM
        select DM_ETH
@@ -627,7 +619,6 @@ config ARCH_SUNXI
        select DM_KEYBOARD
        select DM_SERIAL
        select DM_USB
-       select HUSH_PARSER
        select OF_BOARD_SETUP
        select OF_CONTROL
        select OF_SEPARATE
@@ -637,6 +628,7 @@ config ARCH_SUNXI
        select USB
        select USB_STORAGE
        select USB_KEYBOARD
+       select USE_TINY_PRINTF
 
 config TARGET_TS4800
        bool "Support TS4800"
@@ -665,10 +657,13 @@ config ARCH_ZYNQ
        select DM_GPIO
        select SPL_DM if SPL
        select DM_MMC
+       select DM_MMC_OPS
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
        select SPL_SEPARATE_BSS if SPL
+       select DM_USB if USB
+       select BLK
 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
@@ -677,6 +672,12 @@ config ARCH_ZYNQMP
        select OF_CONTROL
        select DM_SERIAL
        select SUPPORT_SPL
+       select CLK
+       select SPL_CLK
+       select DM_USB if USB
+       select DM_MMC
+       select DM_MMC_OPS
+       select BLK
 
 config TEGRA
        bool "NVIDIA Tegra"
@@ -846,11 +847,19 @@ config STM32
 
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
-       select SUPPORT_SPL
-       select SPL
        select OF_CONTROL
-       select CPU_V7
+       select BLK
        select DM
+       select SPL_DM if SPL
+       select SYS_MALLOC_F
+       select SPL_SYS_MALLOC_SIMPLE if SPL
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_MMC_OPS
+       select DM_SERIAL
+       select DM_SPI
+       select DM_SPI_FLASH
 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"
@@ -916,8 +925,8 @@ source "arch/arm/cpu/armv8/Kconfig"
 source "arch/arm/imx-common/Kconfig"
 
 source "board/bosch/shc/Kconfig"
-source "board/BuR/kwb/Kconfig"
-source "board/BuR/tseries/Kconfig"
+source "board/BuR/brxre1/Kconfig"
+source "board/BuR/brppt1/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/gplugd/Kconfig"