Hi Thomas, On 4/18/19 8:00 PM, Thomas Huth wrote: > This patch is slightly based on earlier work by Ákos Kovács (i.e. > his "hw/arm/Kconfig: Add ARM Kconfig" patch). > > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > default-configs/arm-softmmu.mak | 8 +------- > hw/arm/Kconfig | 8 ++++++++ > hw/display/Kconfig | 1 + > 3 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 50a4be3cad..6195b75f48 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y > > CONFIG_EXYNOS4=y > CONFIG_HIGHBANK=y > +CONFIG_INTEGRATOR=y > > CONFIG_VGA=y > CONFIG_NAND=y > @@ -33,7 +34,6 @@ CONFIG_ADS7846=y > CONFIG_MAX111X=y > CONFIG_SSI_SD=y > CONFIG_SSI_M25P80=y > -CONFIG_SMC91C111=y > CONFIG_ALLWINNER_EMAC=y > CONFIG_IMX_FEC=y > CONFIG_FTGMAC100=y > @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y > CONFIG_NETDUINO2=y > > CONFIG_PL041=y > -CONFIG_PL050=y
You remove this device but it is used by the realview/versatile/vexpress (you add it to these machines later in patch 11). > CONFIG_PL080=y > -CONFIG_PL110=y Ditto, > -CONFIG_PL181=y Ditto. > CONFIG_PL190=y > CONFIG_PL330=y > CONFIG_CADENCE=y > @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y > CONFIG_PCI_EXPRESS=y > CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y > > -CONFIG_INTEGRATOR=y > -CONFIG_INTEGRATOR_DEBUG=y > - > CONFIG_ALLWINNER_A10_PIT=y > CONFIG_ALLWINNER_A10_PIC=y > CONFIG_ALLWINNER_A10=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 0ba377ac18..ad3b1f9b40 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -32,6 +32,14 @@ config HIGHBANK > > config INTEGRATOR > bool > + select ARM_TIMER > + select INTEGRATOR_DEBUG > + select PL011 # UART > + select PL031 # RTC > + select PL050 # keyboard/mouse > + select PL110 # pl111 LCD controller > + select PL181 # display > + select SMC91C111 > > config MAINSTONE > bool > diff --git a/hw/display/Kconfig b/hw/display/Kconfig > index 72be57a403..a11815c9af 100644 > --- a/hw/display/Kconfig > +++ b/hw/display/Kconfig > @@ -21,6 +21,7 @@ config JAZZ_LED > > config PL110 > bool > + select FRAMEBUFFER > > config SII9022 > bool >
