Received: from eggs.gnu.org ([209.51.188.92]:55097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzK-0006Mk-D6 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzI-0004UN-CK for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:38 -0400 From: Thomas Huth Date: Tue, 30 Apr 2019 09:13:40 +0200 Message-Id: <20190430071405.16714-6-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 05/30] hw/arm: Express dependencies of the exynos machines with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Cc: Beniamino Galvani , Rob Herring , Aurelien Jarno , Cedric Le Goater , Jan Kiszka , qemu-arm@nongnu.org, Andrzej Zaborowski , John Snow , Igor Mitsyanko , Joel Stanley , Peter Chubb , "Edgar E . Iglesias" , Antony Pavlov , qemu-block@nongnu.org, Jean-Christophe Dubois , Marcel Apfelbaum , Philippe Mathieu-Daude , Alistair Francis , "Michael S. Tsirkin" , Subbaraya Sundeep , Andrew Jeffery , Andrey Smirnov , Gerd Hoffmann Add Kconfig dependencies for the Exynos-related boards (nuri and smdkc210). This patch is slightly based on earlier work by =C3=81kos Kov=C3=A1cs (i.= e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 613d19a06d..2a11e76cc7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,14 @@ # Default configuration for arm-softmmu =20 +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=3Dy + CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_PCI_TESTDEV=3Dy + +CONFIG_EXYNOS4=3Dy + CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -26,7 +32,6 @@ CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_LAN9118=3Dy CONFIG_SMC91C111=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy @@ -36,21 +41,15 @@ CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy CONFIG_USB_MUSB=3Dy -CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_ARM11MPCORE=3Dy -CONFIG_A9MPCORE=3Dy CONFIG_A15MPCORE=3Dy =20 -CONFIG_ARM_V7M=3Dy CONFIG_NETDUINO2=3Dy =20 -CONFIG_ARM_GIC=3Dy CONFIG_ARM_TIMER=3Dy -CONFIG_ARM_MPTIMER=3Dy -CONFIG_A9_GTIMER=3Dy CONFIG_PL011=3Dy CONFIG_PL022=3Dy CONFIG_PL031=3Dy @@ -61,11 +60,9 @@ CONFIG_PL080=3Dy CONFIG_PL110=3Dy CONFIG_PL181=3Dy CONFIG_PL190=3Dy -CONFIG_PL310=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_XGMAC=3Dy -CONFIG_EXYNOS4=3Dy CONFIG_PXA2XX=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy @@ -73,7 +70,6 @@ CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_ARM11SCU=3Dy -CONFIG_A9SCU=3Dy CONFIG_DIGIC=3Dy CONFIG_MARVELL_88W8618=3Dy CONFIG_OMAP=3Dy @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=3Dy CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 -CONFIG_SDHCI=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_INTEGRATOR_DEBUG=3Dy =20 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d298fbdc89..acd07b2add 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -8,7 +8,13 @@ config DIGIC =20 config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS =20 config HIGHBANK bool @@ -104,6 +110,10 @@ config ZAURUS =20 config A9MPCORE bool + select A9_GTIMER + select A9SCU # snoop control unit + select ARM_GIC + select ARM_MPTIMER =20 config A15MPCORE bool --=20 2.21.0