[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 mac
From: |
Thomas Huth |
Subject: |
[Qemu-arm] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig |
Date: |
Wed, 13 Feb 2019 09:38:13 +0100 |
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 <address@hidden>
---
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
- [Qemu-arm] [PATCH v2 00/25] Kconfig dependencies for ARM machines, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig,
Thomas Huth <=
- [Qemu-arm] [PATCH v2 18/25] hw/arm: Express dependencies of canon-a1100 with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 21/25] hw/arm: Express dependencies for remaining IMX boards with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 13/25] hw/arm: Express dependencies of the virt machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 12/25] hw/arm: Express dependencies of the aspeed boards with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 19/25] hw/arm: Express dependencies of sabrelite with Kconfig, Thomas Huth, 2019/02/13