From: Thomas Huth <thuth@redhat.com>
To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, philmd@redhat.com
Subject: [Qemu-devel] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig
Date: Wed, 13 Feb 2019 09:38:13 +0100 [thread overview]
Message-ID: <1550047098-1210-21-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com>
Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguis between the machine (CONFIG_EMCRAFT_SF2) and the SoC
(CONFIG_MSF2) now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 3 +--
hw/arm/Kconfig | 8 ++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f6193b1..5eceeba 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -30,9 +30,9 @@ CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_DIGIC=y
CONFIG_SABRELITE=y
+CONFIG_EMCRAFT_SF2=y
CONFIG_VGA=y
-CONFIG_SSI_M25P80=y
CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y
@@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
-CONFIG_MSF2=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 70fc73f..cebb410 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -358,9 +358,17 @@ config FSL_IMX6UL
config NRF51_SOC
bool
+config EMCRAFT_SF2
+ bool
+ select MSF2
+ select SSI_M25P80
+
config MSF2
bool
+ select ARM_V7M
select PTIMER
+ select SERIAL
+ select SSI
config ZAURUS
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index ee9f5c6..29dc7d9 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) += virt.o
obj-$(CONFIG_ACPI) += virt-acpi-build.o
obj-$(CONFIG_DIGIC) += digic_boards.o
obj-$(CONFIG_EXYNOS4) += exynos4_boards.o
+obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o
obj-$(CONFIG_HIGHBANK) += highbank.o
obj-$(CONFIG_INTEGRATOR) += integratorcp.o
obj-$(CONFIG_MAINSTONE) += mainstone.o
@@ -41,7 +42,7 @@ obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o
obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o
obj-$(CONFIG_MPS2) += mps2.o
obj-$(CONFIG_MPS2) += mps2-tz.o
-obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o
+obj-$(CONFIG_MSF2) += msf2-soc.o
obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
--
1.8.3.1
next prev parent reply other threads:[~2019-02-13 8:51 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 01/25] hw/arm: Express dependencies of the exynos machines with Kconfig Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank " Thomas Huth
2019-02-14 19:17 ` Peter Maydell
2019-02-14 20:35 ` Paolo Bonzini
2019-02-15 12:15 ` Thomas Huth
2019-02-23 10:56 ` Philippe Mathieu-Daudé
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 03/25] hw/arm: Express dependencies of integratorcp " Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 04/25] hw/arm: Express dependencies of the fsl-imx31 machine " Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 05/25] hw/arm: Express dependencies of musicpal " Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 06/25] hw/arm: Express dependencies of the OMAP machines " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 07/25] hw/arm: Express dependencies of stellaris " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 08/25] hw/arm: Express dependencies of realview, versatile and vexpress " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 09/25] hw/arm: Express dependencies of the PXA2xx machines " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 10/25] hw/arm: Express dependencies of xilinx-zynq " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 11/25] hw/arm: Express dependencies of collie " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 12/25] hw/arm: Express dependencies of the aspeed boards " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 13/25] hw/arm: Express dependencies of the virt machine " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx " Thomas Huth
2019-02-22 18:03 ` Alistair Francis
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 16/25] hw/arm: Express dependencies of the MPS2 boards " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 18/25] hw/arm: Express dependencies of canon-a1100 " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 19/25] hw/arm: Express dependencies of sabrelite " Thomas Huth
2019-02-13 8:38 ` Thomas Huth [this message]
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 21/25] hw/arm: Express dependencies for remaining IMX boards " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1550047098-1210-21-git-send-email-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=yang.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).