From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFy-00021O-NG for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq5D-0006Ey-K9 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:56 -0500 From: Thomas Huth Date: Wed, 13 Feb 2019 09:38:15 +0100 Message-Id: <1550047098-1210-23-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Add Kconfig dependencies for the NRF51 / microbit machine. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 6 ++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ebe5de6..c1bc6ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -31,11 +31,10 @@ CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y +CONFIG_MICROBIT=y CONFIG_VGA=y -CONFIG_NRF51_SOC=y - CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c2fba8e..3d96d1b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -373,8 +373,14 @@ config FSL_IMX6UL select IMX_I2C select SDHCI +config MICROBIT + bool + select NRF51_SOC + config NRF51_SOC bool + select I2C + select ARM_V7M config EMCRAFT_SF2 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 29dc7d9..88b90ca 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o obj-$(CONFIG_HIGHBANK) += highbank.o obj-$(CONFIG_INTEGRATOR) += integratorcp.o obj-$(CONFIG_MAINSTONE) += mainstone.o +obj-$(CONFIG_MICROBIT) += microbit.o obj-$(CONFIG_MUSICPAL) += musicpal.o obj-$(CONFIG_NETDUINO2) += netduino2.o obj-$(CONFIG_NSERIES) += nseries.o @@ -47,4 +48,4 @@ obj-$(CONFIG_ARMSSE) += armsse.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o -- 1.8.3.1