From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:43964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tt4-0005aK-3X for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tt3-0000V1-3e for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:42 -0500 From: Thomas Huth Date: Thu, 7 Mar 2019 15:18:36 +0100 Message-Id: <1551968334-18982-12-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 11/29] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, John Snow , "Michael S. Tsirkin" , Peter Maydell This patch is slightly based on earlier work by =C3=81kos Kov=C3=A1cs (i.= e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 21 +++--------------- hw/arm/Kconfig | 47 +++++++++++++++++++++++++++++++++++= ++++++ hw/arm/Makefile.objs | 3 ++- hw/display/Kconfig | 1 + hw/i2c/Kconfig | 2 +- 5 files changed, 54 insertions(+), 20 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 46ec4eb..41df0af 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,8 +3,6 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=3Dy =20 -CONFIG_PCI_DEVICES=3Dy - CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -15,6 +13,9 @@ CONFIG_CHEETAH=3Dy CONFIG_SX1=3Dy CONFIG_NSERIES=3Dy CONFIG_STELLARIS=3Dy +CONFIG_REALVIEW=3Dy +CONFIG_VERSATILE=3Dy +CONFIG_VEXPRESS=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -23,8 +24,6 @@ CONFIG_SERIAL=3Dy CONFIG_MAX7310=3Dy CONFIG_TMP421=3Dy CONFIG_PCA9552=3Dy -CONFIG_DDC=3Dy -CONFIG_SII9022=3Dy CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy CONFIG_SSI_M25P80=3Dy @@ -36,13 +35,8 @@ CONFIG_MICRODRIVE=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 -CONFIG_ARM11MPCORE=3Dy - CONFIG_NETDUINO2=3Dy =20 -CONFIG_PL041=3Dy -CONFIG_PL080=3Dy -CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_PXA2XX=3Dy @@ -50,12 +44,10 @@ CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 -CONFIG_ARM11SCU=3Dy CONFIG_DIGIC=3Dy CONFIG_MAINSTONE=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_REALVIEW=3Dy CONFIG_ZAURUS=3Dy CONFIG_ZYNQ=3Dy CONFIG_STM32F2XX_TIMER=3Dy @@ -84,10 +76,6 @@ CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy CONFIG_ARMSSE_MHU=3Dy =20 -CONFIG_VERSATILE=3Dy -CONFIG_VERSATILE_PCI=3Dy -CONFIG_VERSATILE_I2C=3Dy - CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 @@ -118,6 +106,3 @@ CONFIG_XILINX_AXI=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy - -# for realview and versatilepb -CONFIG_LSI_SCSI_PCI=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index cb19fd3..2a82a4f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -93,6 +93,29 @@ config PXA2XX =20 config REALVIEW bool + imply PCI_DEVICES + select SMC91C111 + select LAN9118 + select A9MPCORE + select A15MPCORE + select ARM11MPCORE + select ARM_TIMER + select VERSATILE_PCI + select WM8750 # audio codec + select LSI_SCSI_PCI + select PCI + select PL011 # UART + select PL031 # RTC + select PL041 # audio codec + select PL050 # keyboard/mouse + select PL061 # GPIO + select PL080 # DMA controller + select PL110 + select PL181 # display + select PL310 # cache controller + select VERSATILE_I2C + select DS1338 # I2C RTC+NVRAM + select USB_OHCI =20 config STELLARIS bool @@ -116,6 +139,29 @@ config SX1 =20 config VERSATILE bool + select ARM_TIMER # sp804 + select PFLASH_CFI01 + select LSI_SCSI_PCI + select PL050 # keyboard/mouse + select PL080 # DMA controller + select PL190 # Vector PIC + select REALVIEW + select USB_OHCI + +config VEXPRESS + bool + select A9MPCORE + select A15MPCORE + select ARM_MPTIMER + select ARM_TIMER # sp804 + select LAN9118 + select PFLASH_CFI01 + select PL011 # UART + select PL041 # audio codec + select PL181 # display + select REALVIEW + select SII9022 + select VIRTIO_MMIO =20 config ZYNQ bool @@ -189,6 +235,7 @@ config A15MPCORE =20 config ARM11MPCORE bool + select ARM11SCU =20 config ARMSSE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 8302b8d..bd0b45a 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -15,7 +15,8 @@ obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.o tosa.o z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o obj-$(CONFIG_STRONGARM) +=3D collie.o -obj-$(CONFIG_VERSATILE) +=3D vexpress.o versatilepb.o +obj-$(CONFIG_VERSATILE) +=3D versatilepb.o +obj-$(CONFIG_VEXPRESS) +=3D vexpress.o obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o =20 obj-$(CONFIG_ARM_V7M) +=3D armv7m.o diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 364d628..25116e6 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -26,6 +26,7 @@ config PL110 config SII9022 bool depends on I2C + select DDC =20 config SSD0303 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index ef1caa6..0004893 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -12,7 +12,7 @@ config DDC =20 config VERSATILE_I2C bool - select I2C + select BITBANG_I2C =20 config ACPI_SMBUS bool --=20 1.8.3.1