From: Michal Simek Date: Mon, 4 Apr 2016 13:32:20 +0000 (+0200) Subject: ARM64: zynqmp: Do not setup DM_ETH/GPIO/MMC by default for all boards X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad46422af0bd8dc0e6fb46762b1c125a664afeab;p=thirdparty%2Fu-boot.git 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 --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 224eae9281e..8a228f17227 100644 --- 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 79d15c96219..0924f79e1e7 100644 --- 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 382e4003919..ab2bcde63f5 100644 --- 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 f7907c83e29..c9b30e0ef46 100644 --- 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 620d8cf9464..be86c4dc7c5 100644 --- 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 5b1b7b7e9db..2823121bc67 100644 --- 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