On 4/18/19 8:00 PM, Thomas Huth wrote: > This cleans up most settings in default-configs/aarch64-softmmu.mak. > > Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > 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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644 > --- a/hw/display/Kconfig > +++ b/hw/display/Kconfig > @@ -108,6 +108,7 @@ config VIRTIO_VGA > > config DPCD > bool > + select AUX > > config ATI_VGA > bool >
