From nobody Wed Oct 22 04:08:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519883249275679.6836212061462; Wed, 28 Feb 2018 21:47:29 -0800 (PST) Received: from localhost ([::1]:48401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erH3o-00080U-BL for importer@patchew.org; Thu, 01 Mar 2018 00:47:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erH2t-0007e6-Vv for qemu-devel@nongnu.org; Thu, 01 Mar 2018 00:46:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erH2t-0004FZ-0x for qemu-devel@nongnu.org; Thu, 01 Mar 2018 00:46:24 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:32970 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erH2m-0004Dz-QQ; Thu, 01 Mar 2018 00:46:16 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E0F4402291E; Thu, 1 Mar 2018 05:46:13 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-91.ams2.redhat.com [10.36.116.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0690213AEF5; Thu, 1 Mar 2018 05:46:09 +0000 (UTC) From: Thomas Huth To: qemu-arm@nongnu.org, Peter Maydell Date: Thu, 1 Mar 2018 06:46:08 +0100 Message-Id: <1519883168-22092-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 01 Mar 2018 05:46:13 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 01 Mar 2018 05:46:13 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] hw/arm: Use more CONFIG switches to decide which object files should be linked X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A lot of ARM object files are linked into the executable unconditionally, even though we have corresponding CONFIG switches like CONFIG_PXA2XX or CONFIG_OMAP. We should make sure to use these switches in the Makefile so that the users can disable certain unwanted boards and devices more easily. Also introduce the new switch CONFIG_STRONGARM to be able to disable the "Collie" machine if it is not wanted. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 2 ++ hw/arm/Makefile.objs | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index ca34cf4..43f382a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -133,3 +133,5 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_XILINX_AXI=3Dy + +CONFIG_STRONGARM=3Dy diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 1c896ba..5e1e0a9 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,15 +1,23 @@ -obj-y +=3D boot.o collie.o exynos4_boards.o gumstix.o highbank.o -obj-$(CONFIG_DIGIC) +=3D digic_boards.o -obj-y +=3D integratorcp.o mainstone.o musicpal.o nseries.o -obj-y +=3D omap_sx1.o palm.o realview.o spitz.o stellaris.o -obj-y +=3D tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o +obj-y +=3D boot.o virt.o sysbus-fdt.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o -obj-y +=3D netduino2.o -obj-y +=3D sysbus-fdt.o +obj-$(CONFIG_ARM_V7M) +=3D highbank.o netduino2.o vexpress.o +obj-$(CONFIG_ASPEED_SOC) +=3D integratorcp.o musicpal.o versatilepb.o +obj-$(CONFIG_DIGIC) +=3D digic_boards.o +obj-$(CONFIG_EXYNOS4) +=3D exynos4_boards.o +obj-$(CONFIG_NSERIES) +=3D nseries.o +obj-$(CONFIG_OMAP) +=3D omap_sx1.o palm.o +obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.o mainstone.o tosa.o z2.o +obj-$(CONFIG_REALVIEW) +=3D realview.o +obj-$(CONFIG_STELLARIS) +=3D stellaris.o +obj-$(CONFIG_STRONGARM) +=3D collie.o +obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o =20 -obj-y +=3D armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o +obj-$(CONFIG_ARM_V7M) +=3D armv7m.o +obj-$(CONFIG_EXYNOS4) +=3D exynos4210.o +obj-$(CONFIG_PXA2XX) +=3D pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) +=3D digic.o -obj-y +=3D omap1.o omap2.o strongarm.o +obj-$(CONFIG_OMAP) +=3D omap1.o omap2.o +obj-$(CONFIG_STRONGARM) +=3D strongarm.o obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o --=20 1.8.3.1