ARM64: zynqmp: Do not setup DM_ETH/GPIO/MMC by default for all boards

There are mini configurations which need to be fit to OCM that's why
these options shouldn't be enabled by default.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 224eae9281e61d41d80b701190bf237c9cc8b2a5..8a228f172271626c748e170ca2b40e5d61af86b5 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -569,9 +569,6 @@ config ARCH_ZYNQMP
        select DM
        select DM_SPI
        select DM_SPI_FLASH
-       select DM_ETH
-       select DM_GPIO
-       select DM_MMC
        select DM_SERIAL
        select OF_CONTROL
        select SPL_DISABLE_OF_CONTROL

diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 79d15c96219aa3a5600b9c666b2b4eea1caa268c..0924f79e1e7b92003d95e2be2f2a873d8e0b7eef 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_DM_GPIO=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_NAND_ARASAN=y
 CONFIG_ZYNQMP_USB=y
@@ -27,7 +28,9 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
 # CONFIG_REGEX is not set

diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 382e4003919601f5949a43d7e01230e6951a5f1c..ab2bcde63f5875464dce25d92c319ccc4d0af694 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_ZYNQMP_ZC1751_XM015_DC1=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
@@ -19,6 +20,8 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y

diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index f7907c83e29df0e0ede6da7b656c6a26f9b50ea1..c9b30e0ef46c28386d62bdbc294ebff72765c13e 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_ZYNQMP_ZC1751_XM016_DC2=y
 CONFIG_NAND_ARASAN=y
 CONFIG_ZYNQMP_USB=y
@@ -19,7 +20,9 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_SPI=y

diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index 620d8cf9464fc96da66532d6b60ca3ccf961e7df..be86c4dc7c56b53ef1855b763c554ced0e6235cc 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_ZYNQMP_ZC1751_XM019_DC5=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5"
@@ -15,3 +16,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
+CONFIG_DM_MMC=y
+CONFIG_DM_ETH=y

diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
index 5b1b7b7e9db43b08bf2815b394064269728c6e59..2823121bc6732847bb47c1a23a4343c0c0d2aefb 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_ZYNQMP_ZCU102=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
@@ -19,6 +20,8 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y