From patchwork Tue Jan 10 16:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 640858 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2839625pvb; Tue, 10 Jan 2023 09:58:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXuveyNQ/BYp4cvgY72VKWS0TGvZ1PLBc8krid7sZHWDtle28s0ZEPa8fPjvLv/Di3gzXdhF X-Received: by 2002:ac8:7ed8:0:b0:3a7:ed21:ac47 with SMTP id x24-20020ac87ed8000000b003a7ed21ac47mr95142464qtj.18.1673373480489; Tue, 10 Jan 2023 09:58:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673373480; cv=none; d=google.com; s=arc-20160816; b=DPRhCJII8czo91nALWjbgfvrdRmIkgM+QqZJQ1IkqMLCDj2LcVYUpkvvQ7pWGk1V3D GrJJltscC/QSGdHqclDlKiE6HaU7XqItKDQ/tqqV0brItj1f5GqWCzxJpNF+YJsfcod3 /hE4/zcEIYZ6Ugp84Z3ghRRN4GeZ5S4oK0JF/AENxwSAFkOIrHCuC9+sS1uk/NZcSycX bkUIVZ21yIEZ19pRwAHi7UA1ofMc3rJ7OdvuixZPdft3IVqUkomggUPQfjavi3kNMAB8 ASYztN/uo9eFL/Lnym2FSGTP9U9kvrtXD0cUQjlV3vvyqHk7o44oKq5hta5RdOMvJJGo SkBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Fiw9Fg+p/b/j5dB2Y7ot3w6ih2sYibESUE4ugSZG2HU=; b=j1xC317bOco0hfpI8L4toQjPWR9X2HG1Ug8qFdNmI9q6DUCjfwKyYKDim5glMQMW0Z ZCHt+AxGjrjMs1HYq4o2WV5o9sRwALmA3pssa87dDkPJs24xrrErtf7MIKNxttrnBHBm 640mf8VWmsndK0rlXvYj8c9Ce9i0mpgRMl6IEfuVNYiF6HpjDM3JSg4ON+mqBpneptWo WcV8KVqCJib61fBtJENavUEy2xtbxLBgoACgM1ixP6+4TyDtbIBtVM/dxajewWRBR0IB n6X+FOLXAfl59cq3v0p+eOOPnPVORhprIN4vDHefPXxo7T1jDpiJ/VQmfagbstAUVW2V CPHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lvZKso0O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTP id c11-20020ac853cb000000b003a7f3c46cffsi6580015qtq.716.2023.01.10.09.58.00 for ; Tue, 10 Jan 2023 09:58:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lvZKso0O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFHkk-0004QU-B0; Tue, 10 Jan 2023 11:45:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFHkL-00048y-R9 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 11:45:12 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFHkJ-0006Qu-Vg for qemu-devel@nongnu.org; Tue, 10 Jan 2023 11:45:09 -0500 Received: by mail-wm1-x330.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so7566800wma.1 for ; Tue, 10 Jan 2023 08:45:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fiw9Fg+p/b/j5dB2Y7ot3w6ih2sYibESUE4ugSZG2HU=; b=lvZKso0OLD7UZt4Kw7hqdjQaaufZBzyBplHVmkt+ENOOdpiKkwLSjVIrZlRRUPTZF6 bVX3qVsWXkf0WwVDDTpu/vmk0+Hij015K8suDYMuUNoX96QrUiUh91DCqrhW7gzG9k0f 9XA2JkWzVt3m0tVD2Sd5jiw7/5F5536EoR7Q+lvIFfLMT82eJCOsFXI0fcBGNOsxkm2c 1P77PtWvcml6hphMeTJ+P+prMGYBLwu64ayohuY8IMWqQ7CmGnVtjx5rPteoiyRXIz+N ze0b9gldvJBSBwZT2ejGnsJ5JZbvneywEOco7/e8TCh3LmawC+5n6Kzl1tUR1G/70dtx I7rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fiw9Fg+p/b/j5dB2Y7ot3w6ih2sYibESUE4ugSZG2HU=; b=l6O6NSS+4wV3UyW9xm1y02zKNvppilsvsIbvZM/VqJdY2Xo7r9F952DxGyxNLzqpt7 WX39aLZpmN3eDOFLlhOb3a6hGFdyHzemsMzXQ3N4lwufRXq6AzuVIiH9i+ldWvB9ZKcl UaMjzvPXzxudkdDujh/giygNOmgUkzPJwYhBbqdZerq7H9M/XczLFrM+qoZFsCqGVDli HaxltCWgTLGtRAKpKbk1mrHTihsl1kSD8UdMhTqrgPYS4bhVWUFFmb983RyZBq8fa4wt HoDow3gtWpE6J4EbnT+Cl0U3piZMVLZsQ3j8FsgZK4BJ0JpE99KmfL62BvePjh8Tpjfr hAyg== X-Gm-Message-State: AFqh2kqzcCbPooyAq3AgzkbGAMkVqkfHHcPx/GuQiHsLLFAti/g14Nwj DrmfhN9BQW4UxcUouDiY6+no4MQA2T+5/Cbx X-Received: by 2002:a05:600c:5006:b0:3d2:3eda:dd1 with SMTP id n6-20020a05600c500600b003d23eda0dd1mr50317185wmr.17.1673369105106; Tue, 10 Jan 2023 08:45:05 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id v8-20020a05600c444800b003c21ba7d7d6sm16729392wmn.44.2023.01.10.08.45.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jan 2023 08:45:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: ale@rev.ng, Andrey Smirnov , Thomas Huth , Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Niek Linnenbank , Jean-Christophe Dubois , Antonio Caggiano , Rob Herring , Antony Pavlov , Jan Kiszka , Beniamino Galvani Subject: [PATCH 10/18] hw/arm: Move various armv7m-related units to softmmu_ss[] Date: Tue, 10 Jan 2023 17:43:58 +0100 Message-Id: <20230110164406.94366-11-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230110164406.94366-1-philmd@linaro.org> References: <20230110164406.94366-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In the previous commit we remove the indirect dependency on "target/arm/cpu.h" from all these ARMv7-M units: - armsse.c - msf2-som.c - microbit.c - mps2-tz.c - mps2.c - msf2-soc.c - musca.c - netduino2.c - netduinoplus2.c - nrf51_soc.c - stellaris.c - stm32f100_soc.c - stm32f205_soc.c - stm32f405_soc.c - stm32vldiscovery.c We can now move them to meson's softmmu_ss[] source set to buid them once. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/meson.build | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index f742107847..f7e1d4add6 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -3,7 +3,6 @@ arm_ss.add(files('boot.c'), fdt) arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) -arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c')) arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) @@ -11,8 +10,6 @@ arm_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c')) arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) -arm_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) -arm_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vldiscovery.c')) arm_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) @@ -26,9 +23,6 @@ arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c', 'omap2.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) -arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) -arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c', 'xlnx-zcu102.c')) arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xlnx-versal-virt.c')) arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c')) @@ -40,27 +34,36 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_ast2600.c', 'aspeed_ast10x0.c', 'fby35.c')) -arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) -arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) -arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) -arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) -arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.c')) arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) -arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) +softmmu_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) softmmu_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c')) softmmu_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c')) +softmmu_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) softmmu_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c')) softmmu_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) softmmu_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) softmmu_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mainstone.c')) +softmmu_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) +softmmu_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) +softmmu_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) +softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) +softmmu_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) softmmu_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c')) +softmmu_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c')) +softmmu_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c')) softmmu_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c')) +softmmu_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) +softmmu_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) +softmmu_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) +softmmu_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) +softmmu_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vldiscovery.c')) softmmu_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c')) softmmu_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))