From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.25.0.144 with SMTP id 138csp885834lfa; Thu, 27 Apr 2017 10:39:23 -0700 (PDT) X-Received: by 10.31.160.210 with SMTP id j201mr3282646vke.92.1493314763287; Thu, 27 Apr 2017 10:39:23 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r61si1939227uar.63.2017.04.27.10.39.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 27 Apr 2017 10:39:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:33481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nNy-0004Mf-MZ for alex.bennee@linaro.org; Thu, 27 Apr 2017 13:39:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nNa-000490-Sh for qemu-arm@nongnu.org; Thu, 27 Apr 2017 13:39:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3nNX-0005Dl-Vj for qemu-arm@nongnu.org; Thu, 27 Apr 2017 13:38:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3nNX-0005DV-PV; Thu, 27 Apr 2017 13:38:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADD1380483; Thu, 27 Apr 2017 17:38:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ADD1380483 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=wei@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ADD1380483 Received: from weilaptop.redhat.com (ovpn-125-235.rdu2.redhat.com [10.10.125.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3E7A996D0; Thu, 27 Apr 2017 17:38:53 +0000 (UTC) From: Wei Huang To: qemu-arm@nongnu.org Date: Thu, 27 Apr 2017 12:38:46 -0500 Message-Id: <1493314727-6951-2-git-send-email-wei@redhat.com> In-Reply-To: <1493314727-6951-1-git-send-email-wei@redhat.com> References: <1493314727-6951-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 27 Apr 2017 17:38:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-arm] [PATCH 1/2] armv7m: Make armv7m SoC compilation dependent on CONFIG_ARM_V7M X-BeenThere: qemu-arm@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@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: ODN0m2kTkH4k In current QEMU, when CONFIG_ARM_V7M is not configured, armv7m_nvic.c and armv7m_systick.c won't be compiled. This causes dependency issues for armv7m SoC because armv7m uses the device "armv7m_nvic". This patch makes the compilation of armv7m.c and other v7m SoC dependent on CONFIG_ARM_V7M. Signed-off-by: Wei Huang --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Makefile.objs | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 78d7af0..a89d77d 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -15,7 +15,6 @@ CONFIG_TWL92230=y CONFIG_TSC2005=y CONFIG_LM832X=y CONFIG_TMP105=y -CONFIG_STELLARIS=y CONFIG_STELLARIS_INPUT=y CONFIG_STELLARIS_ENET=y CONFIG_SSD0303=y @@ -92,7 +91,6 @@ CONFIG_STM32F2XX_USART=y CONFIG_STM32F2XX_SYSCFG=y CONFIG_STM32F2XX_ADC=y CONFIG_STM32F2XX_SPI=y -CONFIG_STM32F205_SOC=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 4c5c4ee..e3c5fc5 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,18 +1,17 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-y += integratorcp.o mainstone.o musicpal.o nseries.o -obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o +obj-y += omap_sx1.o palm.o realview.o spitz.o obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o obj-$(CONFIG_ACPI) += virt-acpi-build.o -obj-y += netduino2.o obj-y += sysbus-fdt.o -obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o +obj-y += exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o +obj-$(CONFIG_ARM_V7M) += armv7m.o netduino2.o stellaris.o stm32f205_soc.o obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o -obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o -- 1.8.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nNc-00049Z-WC for qemu-devel@nongnu.org; Thu, 27 Apr 2017 13:39:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3nNc-0005Fn-8L for qemu-devel@nongnu.org; Thu, 27 Apr 2017 13:39:01 -0400 From: Wei Huang Date: Thu, 27 Apr 2017 12:38:46 -0500 Message-Id: <1493314727-6951-2-git-send-email-wei@redhat.com> In-Reply-To: <1493314727-6951-1-git-send-email-wei@redhat.com> References: <1493314727-6951-1-git-send-email-wei@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] armv7m: Make armv7m SoC compilation dependent on CONFIG_ARM_V7M List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org In current QEMU, when CONFIG_ARM_V7M is not configured, armv7m_nvic.c and armv7m_systick.c won't be compiled. This causes dependency issues for armv7m SoC because armv7m uses the device "armv7m_nvic". This patch makes the compilation of armv7m.c and other v7m SoC dependent on CONFIG_ARM_V7M. Signed-off-by: Wei Huang --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Makefile.objs | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 78d7af0..a89d77d 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -15,7 +15,6 @@ CONFIG_TWL92230=y CONFIG_TSC2005=y CONFIG_LM832X=y CONFIG_TMP105=y -CONFIG_STELLARIS=y CONFIG_STELLARIS_INPUT=y CONFIG_STELLARIS_ENET=y CONFIG_SSD0303=y @@ -92,7 +91,6 @@ CONFIG_STM32F2XX_USART=y CONFIG_STM32F2XX_SYSCFG=y CONFIG_STM32F2XX_ADC=y CONFIG_STM32F2XX_SPI=y -CONFIG_STM32F205_SOC=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 4c5c4ee..e3c5fc5 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,18 +1,17 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-y += integratorcp.o mainstone.o musicpal.o nseries.o -obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o +obj-y += omap_sx1.o palm.o realview.o spitz.o obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o obj-$(CONFIG_ACPI) += virt-acpi-build.o -obj-y += netduino2.o obj-y += sysbus-fdt.o -obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o +obj-y += exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o +obj-$(CONFIG_ARM_V7M) += armv7m.o netduino2.o stellaris.o stm32f205_soc.o obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o -obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o -- 1.8.3.1