From nobody Mon Feb 9 06:00:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550909674297965.3915284469759; Sat, 23 Feb 2019 00:14:34 -0800 (PST) Received: from localhost ([127.0.0.1]:34448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxSS7-0006NA-2b for importer@patchew.org; Sat, 23 Feb 2019 03:14:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxS5A-0005N7-DW for qemu-devel@nongnu.org; Sat, 23 Feb 2019 02:50:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxS57-0002vJ-Um for qemu-devel@nongnu.org; Sat, 23 Feb 2019 02:50:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38110) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxS51-0002Wo-Ub; Sat, 23 Feb 2019 02:50:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9DFF381E17; Sat, 23 Feb 2019 07:50:17 +0000 (UTC) Received: from thuth.com (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4550F5D9CA; Sat, 23 Feb 2019 07:50:16 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Sat, 23 Feb 2019 08:49:16 +0100 Message-Id: <1550908162-22644-25-git-send-email-thuth@redhat.com> In-Reply-To: <1550908162-22644-1-git-send-email-thuth@redhat.com> References: <1550908162-22644-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sat, 23 Feb 2019 07:50:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 24/30] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the emcraft-sf2 machine - we also distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 12 ++++++++++-- hw/arm/Makefile.objs | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 9150858..a01e407 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -31,9 +31,9 @@ CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_DIGIC=3Dy CONFIG_SABRELITE=3Dy +CONFIG_EMCRAFT_SF2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_SSI_M25P80=3Dy CONFIG_IMX_FEC=3Dy =20 CONFIG_NRF51_SOC=3Dy @@ -46,5 +46,4 @@ CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy -CONFIG_MSF2=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 8418047..9495e7f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -331,7 +331,6 @@ config MPS2 select MPS2_SCC select PL022 # Serial port select PL080 # DMA controller - select TZ_MPC =20 config IOTKIT bool @@ -348,9 +347,17 @@ config FSL_IMX6UL config NRF51_SOC bool =20 +config EMCRAFT_SF2 + bool + select MSF2 + select SSI_M25P80 + config MSF2 bool + select ARM_V7M select PTIMER + select SERIAL + select SSI =20 config ZAURUS bool @@ -375,13 +382,14 @@ config ARM11MPCORE config ARMSSE bool select ARMSSE_CPUID - select CMSDK_APB_TIMER select CMSDK_APB_DUALTIMER + select CMSDK_APB_TIMER select CMSDK_APB_UART select CMSDK_APB_WATCHDOG select IOTKIT_SECCTL select IOTKIT_SYSCTL select IOTKIT_SYSINFO + select TZ_MPC select TZ_MSC select TZ_PPC =20 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fadd698..eae9f6c 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) +=3D virt.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o obj-$(CONFIG_DIGIC) +=3D digic_boards.o obj-$(CONFIG_EXYNOS4) +=3D exynos4_boards.o +obj-$(CONFIG_EMCRAFT_SF2) +=3D msf2-som.o obj-$(CONFIG_HIGHBANK) +=3D highbank.o obj-$(CONFIG_INTEGRATOR) +=3D integratorcp.o obj-$(CONFIG_MAINSTONE) +=3D mainstone.o @@ -41,7 +42,7 @@ obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) +=3D mps2.o obj-$(CONFIG_MPS2) +=3D mps2-tz.o -obj-$(CONFIG_MSF2) +=3D msf2-soc.o msf2-som.o +obj-$(CONFIG_MSF2) +=3D msf2-soc.o obj-$(CONFIG_MUSCA) +=3D musca.o obj-$(CONFIG_ARMSSE) +=3D armsse.o obj-$(CONFIG_FSL_IMX7) +=3D fsl-imx7.o mcimx7d-sabre.o --=20 1.8.3.1