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

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/aarch64-softmmu.mak |  4 ----
 hw/arm/Kconfig                      | 12 ++++++++++++
 hw/display/Kconfig                  |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
index 4ea9add..3a4b15e 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/aarch64-softmmu.mak
@@ -3,10 +3,6 @@
 # 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
 CONFIG_ARM_SMMUV3=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index aad2dd3..3577550 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -291,6 +291,18 @@ 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
+    select PCI      # TODO: Currently required for SDHCI and AHCI, remove later
 
 config XLNX_VERSAL
     bool
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index a5f3fc0..d2ae2f1 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -108,3 +108,4 @@ config VIRTIO_VGA
 
 config DPCD
     bool
+    select AUX
-- 
1.8.3.1

On 09/02/19 07:39, Thomas Huth wrote:
> +    select PCI      # TODO: Currently required for SDHCI and AHCI, remove later

I think SDHCI and AHCI should select it instead, similar to how FDC
selects ISA_BUS (see patch 25 of the Kconfig series).

Paolo

On 2019-02-11 15:45, Paolo Bonzini wrote:
> On 09/02/19 07:39, Thomas Huth wrote:
>> +    select PCI      # TODO: Currently required for SDHCI and AHCI, remove later
> 
> I think SDHCI and AHCI should select it instead, similar to how FDC
> selects ISA_BUS (see patch 25 of the Kconfig series).

Yes, that's likely the better way to work-around this issue. I'll add
that in v2 ...

 Thomas