From: Thomas Huth <thuth@redhat.com>
To: yang.zhong@intel.com, Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, pbonzini@redhat.com
Cc: Beniamino Galvani <b.galvani@gmail.com>,
Rob Herring <robh@kernel.org>,
Aurelien Jarno <aurelien@aurel32.net>,
Cedric Le Goater <clg@kaod.org>, Jan Kiszka <jan.kiszka@web.de>,
qemu-arm@nongnu.org, Andrzej Zaborowski <balrogg@gmail.com>,
John Snow <jsnow@redhat.com>,
Igor Mitsyanko <i.mitsyanko@gmail.com>,
Joel Stanley <joel@jms.id.au>,
Peter Chubb <peter.chubb@nicta.com.au>,
"Edgar E . Iglesias" <edgar.iglesias@gmail.com>,
Antony Pavlov <antonynpavlov@gmail.com>,
qemu-block@nongnu.org,
Jean-Christophe Dubois <jcd@tribudubois.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Philippe Mathieu-Daude <f4bug@amsat.org>,
Alistair Francis <alistair@alistair23.me>,
"Michael S. Tsirkin" <mst@redhat.com>,
Subbaraya Sundeep <sundeep.lkml@gmail.com>,
Andrew Jeffery <andrew@aj.id.au>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v6 24/30] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
Date: Tue, 30 Apr 2019 09:13:59 +0200 [thread overview]
Message-ID: <20190430071405.16714-25-thuth@redhat.com> (raw)
In-Reply-To: <20190430071405.16714-1-thuth@redhat.com>
Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC
(CONFIG_MSF2) now.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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 ef7dd7156a..1455d083d8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,9 +34,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
@@ -49,5 +49,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 0a1eab568b..7af94a8184 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -334,9 +334,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 fadd69882c..eae9f6c442 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_MUSCA) += musca.o
obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
--
2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Huth <thuth@redhat.com>
To: yang.zhong@intel.com, Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, pbonzini@redhat.com
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
"Edgar E . Iglesias" <edgar.iglesias@gmail.com>,
Subbaraya Sundeep <sundeep.lkml@gmail.com>,
Rob Herring <robh@kernel.org>,
qemu-block@nongnu.org, Andrey Smirnov <andrew.smirnov@gmail.com>,
Antony Pavlov <antonynpavlov@gmail.com>,
Joel Stanley <joel@jms.id.au>,
Alistair Francis <alistair@alistair23.me>,
Beniamino Galvani <b.galvani@gmail.com>,
qemu-arm@nongnu.org, Jan Kiszka <jan.kiszka@web.de>,
Cedric Le Goater <clg@kaod.org>, John Snow <jsnow@redhat.com>,
Igor Mitsyanko <i.mitsyanko@gmail.com>,
Philippe Mathieu-Daude <f4bug@amsat.org>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
Andrew Jeffery <andrew@aj.id.au>,
Peter Chubb <peter.chubb@nicta.com.au>,
Aurelien Jarno <aurelien@aurel32.net>
Subject: [Qemu-devel] [PATCH v6 24/30] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
Date: Tue, 30 Apr 2019 09:13:59 +0200 [thread overview]
Message-ID: <20190430071405.16714-25-thuth@redhat.com> (raw)
Message-ID: <20190430071359.iH-njRpV2htBSzWq4MgOpvkCjmAs9CI84dFGsqmiqEo@z> (raw)
In-Reply-To: <20190430071405.16714-1-thuth@redhat.com>
Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC
(CONFIG_MSF2) now.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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 ef7dd7156a..1455d083d8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,9 +34,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
@@ -49,5 +49,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 0a1eab568b..7af94a8184 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -334,9 +334,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 fadd69882c..eae9f6c442 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_MUSCA) += musca.o
obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
--
2.21.0
next prev parent reply other threads:[~2019-04-30 7:18 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 7:13 [Qemu-devel] [PATCH v6 00/30] Kconfig dependencies for ARM machines Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 01/30] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 02/30] hw/ide/ahci: Add a Kconfig switch for the AHCI-ICH9 device Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-05-01 18:39 ` John Snow
2019-05-01 18:39 ` John Snow
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 03/30] hw/usb/hcd-ohci: Do not use PCI functions with sysbus devices in ohci_die() Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 04/30] hw/usb/hcd-ohci: Move PCI-related code into a separate file Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 05/30] hw/arm: Express dependencies of the exynos machines with Kconfig Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 06/30] hw/arm: Express dependencies of the highbank " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 07/30] hw/arm: Express dependencies of integratorcp " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 08/30] hw/arm: Express dependencies of the fsl-imx31 machine " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 09/30] hw/arm: Express dependencies of musicpal " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 10/30] hw/arm: Express dependencies of the OMAP machines " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 11/30] hw/arm: Express dependencies of stellaris " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 8:03 ` Philippe Mathieu-Daudé
2019-04-30 8:03 ` Philippe Mathieu-Daudé
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 12/30] hw/arm: Express dependencies of realview, versatile and vexpress " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 13/30] hw/arm: Express dependencies of the PXA2xx machines " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 14/30] hw/arm: Express dependencies of xilinx-zynq " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 15/30] hw/arm: Express dependencies of collie " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 16/30] hw/arm: Express dependencies of the aspeed boards " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 17/30] hw/arm: Express dependencies of the virt machine " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 18/30] hw/arm: Express dependencies of netduino / stm32f2xx " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 19/30] hw/arm: Express dependencies of allwinner / cubieboard " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 20/30] hw/arm: Express dependencies of the MPS2 boards " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 21/30] hw/arm: Express dependencies of the raspi machines " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 22/30] hw/arm: Express dependencies of canon-a1100 " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 23/30] hw/arm: Express dependencies of sabrelite " Thomas Huth
2019-04-30 7:13 ` Thomas Huth
2019-04-30 7:13 ` Thomas Huth [this message]
2019-04-30 7:13 ` [Qemu-devel] [PATCH v6 24/30] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine " Thomas Huth
2019-04-30 7:14 ` [Qemu-devel] [PATCH v6 25/30] hw/arm: Express dependencies of the remaining IMX boards " Thomas Huth
2019-04-30 7:14 ` Thomas Huth
2019-04-30 7:14 ` [Qemu-devel] [PATCH v6 26/30] hw/arm: Express dependencies of the microbit / nrf51 machine " Thomas Huth
2019-04-30 7:14 ` Thomas Huth
2019-04-30 7:14 ` [Qemu-devel] [PATCH v6 27/30] hw/arm: Express dependencies of the ZynqMP zcu102 " Thomas Huth
2019-04-30 7:14 ` Thomas Huth
2019-04-30 7:14 ` [Qemu-devel] [PATCH v6 28/30] hw/arm: Express dependencies of the xlnx-versal-virt " Thomas Huth
2019-04-30 7:14 ` Thomas Huth
2019-04-30 7:14 ` [Qemu-devel] [PATCH v6 29/30] hw/arm: Express dependencies of the musca machines " Thomas Huth
2019-04-30 7:14 ` Thomas Huth
2019-04-30 7:14 ` [Qemu-devel] [PATCH v6 30/30] hw/arm: Remove hard-enablement of the remaining PCI devices Thomas Huth
2019-04-30 7:14 ` Thomas Huth
2019-04-30 8:34 ` Philippe Mathieu-Daudé
2019-04-30 8:34 ` Philippe Mathieu-Daudé
2019-05-03 15:14 ` [Qemu-devel] [PATCH v6 00/30] Kconfig dependencies for ARM machines Thomas Huth
2019-05-03 15:14 ` Thomas Huth
2019-05-03 15:24 ` [Qemu-devel] [Qemu-arm] " Peter Maydell
2019-05-03 15:24 ` Peter Maydell
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=20190430071405.16714-25-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alistair@alistair23.me \
--cc=andrew.smirnov@gmail.com \
--cc=andrew@aj.id.au \
--cc=antonynpavlov@gmail.com \
--cc=aurelien@aurel32.net \
--cc=b.galvani@gmail.com \
--cc=balrogg@gmail.com \
--cc=clg@kaod.org \
--cc=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=i.mitsyanko@gmail.com \
--cc=jan.kiszka@web.de \
--cc=jcd@tribudubois.net \
--cc=joel@jms.id.au \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.chubb@nicta.com.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=robh@kernel.org \
--cc=sundeep.lkml@gmail.com \
--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).