Received: by 2002:a17:907:c68a:b0:84d:2074:29bb with SMTP id ue10csp3316915ejc; Tue, 10 Jan 2023 08:44:49 -0800 (PST) X-Received: by 2002:a05:600c:1d0e:b0:3cf:8957:a441 with SMTP id l14-20020a05600c1d0e00b003cf8957a441mr16061093wms.12.1673369089044; Tue, 10 Jan 2023 08:44:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673369089; cv=none; d=google.com; s=arc-20160816; b=BHTbZTh10YgVgJrQpGM+z/PCtmObRClbvc79PtY/d/EV67hfisJX8Bo8Ik8er49L9L rDHzAOd36dyIQ/cnUkfMLZGrquCDTBda3S0fEoD+GXSOuAFZDg1S/dYRVzJYx9dQH3yX RMHP8Ty3xE8kePbiLpcTI/p7UpXFad65mCT6SiUGfyNSvhv9Vj6o58bfDDggKUQCK2XG yqDCAhshFCmd3ISoF/63g7+RLlAU4WFlt4IiJR3M7J3vBYw8sUoxM0GJZCeDJMvUMjis f3NT+eePXJaJx0TLMFPTTL0TF3mVmdgVWFJfjYAJ1hxcqr5aKN/RTB7Dpfi+gzZgqJuJ IFKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=U5AzzHmUwF9EkYU4+2STuaeBR+wnyLjuTzOXCdKeZuQ=; b=iLAv2kOGHVE4tR/NAtJBRPmm9cG3jTyluRMLwNWInxV984J0EvS6drylYVKfFtXzsG w2vL3yW0SuoP/fXJfdVIfjBIZfKosr7OcDFz5gt3oSPDEHdg4BbVI3c4QqyEza9zHDfM nqRq+SW5ZT6Wn+atTMuOqgLSVTth2HOkSv+zZyDuxhLDMUawcRFouqVvdWwyaH3FZK+1 Dj/bPNmi4ykeOAQoiOpNaibKEOJGGWz0LBBHTLcp/8wBhqU93EkFSJrAS/OrfqZHB5gW Z4O6yoL7hM0ndjSGWD35ZEGmr4c5hQKyozsJAa2WXXaZY23dA8UEGySjxsufzlXdks1D uSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wTQbab7m; spf=pass (google.com: domain of philmd@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=philmd@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id q4-20020a1cf304000000b003cffc77699asor4885360wmq.28.2023.01.10.08.44.49 for (Google Transport Security); Tue, 10 Jan 2023 08:44:49 -0800 (PST) Received-SPF: pass (google.com: domain of philmd@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wTQbab7m; spf=pass (google.com: domain of philmd@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=philmd@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=U5AzzHmUwF9EkYU4+2STuaeBR+wnyLjuTzOXCdKeZuQ=; b=wTQbab7mRQhcSOmQh1COeTtP/GWmQ0o0ir81b5S3ZSMJ2Ixun3ligJWPjC9uBhyJgh 3lBLT6SVDa8KxQv5lUt+eD2Ol1zI44zI8W/DhWA61qrFhre9DFEYtMDS6Qe1R4qQLsUH OiJj7zrC+P/A/N9AoGDP3mVR01//aG1rP/8kJ/9QP4ZylUauM4pWN/+7GPwhdYEo/hgr B0iGXPAY0eFccA9CD0nABz2gBX2EcJVrg2Kcx9tThFKBIuLto59oVNAn0P8S3j4FOB5E aAbZkcVs6Iyw0kREkUx/fwAhdakQeIFduSVhq8w8fRBqLkoOPW4YYdjH+NnCAv+lwviV Y2bA== 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=U5AzzHmUwF9EkYU4+2STuaeBR+wnyLjuTzOXCdKeZuQ=; b=PCIi6/Lm1j/vcWaFxnR+LdyFK+K3j1lRHlVIzPE4Lzn8hdgpMHp4VfxwgEMnqKPoph iwwEDLOL6UKVUkFZCdBkjSr1o0YiP7cBOqt+mG/YTOrQKtFMly4YgVCl4tYxo/u2a0MM UhmHZNabvvGDbo46lzjVR63n3eob1aCFG1KbpBuUcX8XjCf3PztSH7ThRIy0gnfZ7O1t bVIa8EQ0IK5fRhq4FIpS60cXh+l0BWc9fGQ/fvNjJx4gQZVQzuLN3vF5av+yax2XBDNL CG+jZuTqrTBfih7rzZ6wCEizFSZxYZobo39lhz/4eAKLGSNd9tnBYKRZdvSlEPtPrvpF Oo8w== X-Gm-Message-State: AFqh2kqIAxKEY3VNBN2D6QEg3GllEwzxKZm+lZ2lL6Nv8DtNN8fY+T+f eWvZ1oj2AStG/iIZar4EEALewcVw X-Google-Smtp-Source: AMrXdXtODRXbYbrAiiUNuV9W19oduQLd+MPYCTxNso1bNsLjnfkMPUa8M04sLGYtSiNW5me9qNUQSQ== X-Received: by 2002:a05:600c:3844:b0:3d2:191d:2420 with SMTP id s4-20020a05600c384400b003d2191d2420mr50736477wmr.7.1673369088850; Tue, 10 Jan 2023 08:44:48 -0800 (PST) Return-Path: Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id i8-20020a05600c354800b003cf894dbc4fsm16720914wmq.25.2023.01.10.08.44.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jan 2023 08:44:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: ale@rev.ng, Andrey Smirnov , Thomas Huth , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Niek Linnenbank , Jean-Christophe Dubois , Antonio Caggiano , Rob Herring , Antony Pavlov , Jan Kiszka , Beniamino Galvani Subject: [PATCH 07/18] hw/arm: Move more units to softmmu_ss[] Date: Tue, 10 Jan 2023 17:43:55 +0100 Message-Id: <20230110164406.94366-8-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUID: mbSvw8X6IZzY The following units don't require "target/arm/cpu.h": - collie.c - gumstix.c - omap_sx1.c - z2.c Once the header removed, we can move the units from meson's arm_ss[] to softmmu_ss[] to build them once. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/collie.c | 1 - hw/arm/gumstix.c | 1 - hw/arm/meson.build | 8 ++++---- hw/arm/omap_sx1.c | 1 - hw/arm/z2.c | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 9edff59370..a4576feff0 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -17,7 +17,6 @@ #include "hw/arm/boot.h" #include "hw/block/flash.h" #include "exec/address-spaces.h" -#include "cpu.h" #include "qom/object.h" #define RAM_SIZE (512 * MiB) diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 2ca4140c9f..3f2bcaa24e 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -44,7 +44,6 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" -#include "cpu.h" #define CONNEX_FLASH_SIZE (16 * MiB) #define CONNEX_RAM_SIZE (64 * MiB) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 4babaa8dfc..7c71798661 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -13,16 +13,12 @@ arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c')) arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) 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_SX1', if_true: files('omap_sx1.c')) arm_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c')) -arm_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c')) arm_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c')) -arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.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_COLLIE', if_true: files('collie.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')) @@ -62,8 +58,12 @@ arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-e 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_COLLIE', if_true: files('collie.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_RASPI', if_true: files('bcm2835_peripherals.c')) +softmmu_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) +softmmu_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) hw_arch += {'arm': arm_ss} diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 1d156bc344..c7ddc90d02 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -35,7 +35,6 @@ #include "hw/block/flash.h" #include "sysemu/qtest.h" #include "exec/address-spaces.h" -#include "cpu.h" #include "qemu/cutils.h" /*****************************************************************************/ diff --git a/hw/arm/z2.c b/hw/arm/z2.c index dc25304290..610f3b5a0f 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -25,7 +25,6 @@ #include "hw/audio/wm8750.h" #include "audio/audio.h" #include "exec/address-spaces.h" -#include "cpu.h" #include "qom/object.h" #ifdef DEBUG_Z2 -- 2.38.1