diff options
author | Thomas Huth <thuth@redhat.com> | 2019-02-08 14:52:40 +0100 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2019-05-13 09:36:32 +0200 |
commit | f3c3a1e2bffcf2aafaef38b0aa05737088e77f47 (patch) | |
tree | 4eeff83644125708a80b9b48cb3482411b6db3d4 | |
parent | c1c60b0d14ae2ff822f1761954a4a1ccdcf09b91 (diff) | |
download | qemu-f3c3a1e2bffcf2aafaef38b0aa05737088e77f47.zip |
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>
-rw-r--r-- | default-configs/aarch64-softmmu.mak | 4 | ||||
-rw-r--r-- | hw/arm/Kconfig | 11 | ||||
-rw-r--r-- | 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 |