From f3c3a1e2bffcf2aafaef38b0aa05737088e77f47 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 8 Feb 2019 14:52:40 +0100 Subject: hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This cleans up most settings in default-configs/aarch64-softmmu.mak. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 313490fb38..49ff415ee4 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -3,9 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_AUX=y -CONFIG_DDC=y -CONFIG_DPCD=y -CONFIG_XLNX_ZYNQMP=y CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index da091ac217..eff61efab9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -279,6 +279,17 @@ config STM32F205_SOC config XLNX_ZYNQMP_ARM bool + select AHCI + select ARM_GIC + select CADENCE + select DDC + select DPCD + select SDHCI + select SSI + select SSI_M25P80 + select XILINX_AXI + select XILINX_SPIPS + select XLNX_ZYNQMP config XLNX_VERSAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 784d7a38ae..dc1f113df2 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -113,6 +113,7 @@ config VIRTIO_VGA config DPCD bool + select AUX config ATI_VGA bool -- cgit v1.2.3