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>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > default-configs/arm-softmmu.mak | 6 +----- > hw/arm/Kconfig | 5 +++++ > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 7f94811ccb..0a4d293f8a 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -11,13 +11,13 @@ CONFIG_EXYNOS4=y > CONFIG_HIGHBANK=y > CONFIG_INTEGRATOR=y > CONFIG_FSL_IMX31=y > +CONFIG_MUSICPAL=y > > CONFIG_VGA=y > CONFIG_NAND=y > CONFIG_ECC=y > CONFIG_SERIAL=y > CONFIG_MAX7310=y > -CONFIG_WM8750=y > CONFIG_TWL92230=y > CONFIG_TSC2005=y > CONFIG_LM832X=y > @@ -40,7 +40,6 @@ CONFIG_IMX_FEC=y > CONFIG_FTGMAC100=y > CONFIG_DS1338=y > CONFIG_PFLASH_CFI01=y > -CONFIG_PFLASH_CFI02=y > CONFIG_MICRODRIVE=y > CONFIG_USB_MUSB=y > CONFIG_PLATFORM_BUS=y > @@ -56,14 +55,12 @@ CONFIG_PL190=y > CONFIG_PL330=y > CONFIG_CADENCE=y > CONFIG_PXA2XX=y > -CONFIG_BITBANG_I2C=y > CONFIG_FRAMEBUFFER=y > CONFIG_XILINX_SPIPS=y > CONFIG_ZYNQ_DEVCFG=y > > CONFIG_ARM11SCU=y > CONFIG_DIGIC=y > -CONFIG_MARVELL_88W8618=y > CONFIG_OMAP=y > CONFIG_TSC210X=y > CONFIG_BLIZZARD=y > @@ -137,7 +134,6 @@ CONFIG_XILINX_AXI=y > CONFIG_PCI_EXPRESS_DESIGNWARE=y > > CONFIG_STRONGARM=y > -CONFIG_MUSICPAL=y > > # for realview and versatilepb > CONFIG_LSI_SCSI_PCI=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 9087b7d714..b9f3c3c232 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -46,7 +46,12 @@ config MAINSTONE > > config MUSICPAL > bool > + select BITBANG_I2C > + select MARVELL_88W8618 > select PTIMER > + select PFLASH_CFI02 > + select SERIAL > + select WM8750 > > config NETDUINO2 > bool >