From nobody Fri Oct 24 21:49:09 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520267034369860.7095246531205; Mon, 5 Mar 2018 08:23:54 -0800 (PST) Received: from localhost ([::1]:50240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esstx-0002xU-Gk for importer@patchew.org; Mon, 05 Mar 2018 11:23:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esssy-0002D0-Jf for qemu-devel@nongnu.org; Mon, 05 Mar 2018 11:22:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esssx-0003mj-Lz for qemu-devel@nongnu.org; Mon, 05 Mar 2018 11:22:48 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34260 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 1esssp-0003kS-Mx; Mon, 05 Mar 2018 11:22:39 -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 2A065D1448; Mon, 5 Mar 2018 16:22:36 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-103.ams2.redhat.com [10.36.116.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id E340F2144B21; Mon, 5 Mar 2018 16:22:30 +0000 (UTC) From: Thomas Huth To: qemu-arm@nongnu.org, Peter Maydell Date: Mon, 5 Mar 2018 17:22:29 +0100 Message-Id: <1520266949-29817-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.2]); Mon, 05 Mar 2018 16:22:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 05 Mar 2018 16:22:36 +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 v2] hw/arm: Use more CONFIG switches for the object files 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, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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. While we're at it, also add some new switches for the boards that do not have a CONFIG option yet. Signed-off-by: Thomas Huth --- v2: - Fixed the miscategorization of the boards in v1 - Add separate config switches for the boards that did not have a config switch yet. default-configs/arm-softmmu.mak | 7 +++++++ hw/arm/Makefile.objs | 30 +++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index d724106..96071c8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -47,6 +47,7 @@ CONFIG_A9MPCORE=3Dy CONFIG_A15MPCORE=3Dy =20 CONFIG_ARM_V7M=3Dy +CONFIG_NETDUINO2=3Dy =20 CONFIG_ARM_GIC=3Dy CONFIG_ARM_GIC_KVM=3D$(CONFIG_KVM) @@ -109,6 +110,7 @@ CONFIG_TZ_PPC=3Dy CONFIG_IOTKIT=3Dy CONFIG_IOTKIT_SECCTL=3Dy =20 +CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 @@ -117,6 +119,7 @@ CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 CONFIG_SDHCI=3Dy +CONFIG_INTEGRATOR=3Dy CONFIG_INTEGRATOR_DEBUG=3Dy =20 CONFIG_ALLWINNER_A10_PIT=3Dy @@ -140,3 +143,7 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_XILINX_AXI=3Dy + +CONFIG_STRONGARM=3Dy +CONFIG_HIGHBANK=3Dy +CONFIG_MUSICPAL=3Dy diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 2322581..53611a7 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,15 +1,27 @@ -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_DIGIC) +=3D digic_boards.o +obj-$(CONFIG_EXYNOS4) +=3D exynos4_boards.o +obj-$(CONFIG_HIGHBANK) +=3D highbank.o +obj-$(CONFIG_INTEGRATOR) +=3D integratorcp.o +obj-$(CONFIG_MAINSTONE) +=3D mainstone.o +obj-$(CONFIG_MUSICPAL) +=3D musicpal.o +obj-$(CONFIG_NETDUINO2) +=3D netduino2.o +obj-$(CONFIG_NSERIES) +=3D nseries.o +obj-$(CONFIG_OMAP) +=3D omap_sx1.o palm.o +obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.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_VERSATILE) +=3D vexpress.o versatilepb.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