hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig

This cleans up most settings in default-configs/aarch64-softmmu.mak.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>

diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
index 313490fb38ce28a87b11a9f28adfa1c07d2d12a3..49ff415ee4cd52302195712777313128de3724c6 100644 (file)
--- 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 da091ac217640b3c0515db90e5b471c1c9edfb11..eff61efab996b3d0b8ce2ad09c417ee64bcca294 100644 (file)
--- 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 784d7a38ae46a00a3492ef3616844f379e76d3ed..dc1f113df281c23165d72f455c6d60c0c4113a38 100644 (file)
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -113,6 +113,7 @@ config VIRTIO_VGA
 
 config DPCD
     bool
+    select AUX
 
 config ATI_VGA
     bool