From nobody Fri Nov 14 18:16:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998461; cv=none; d=zohomail.com; s=zohoarc; b=hHTF24IqNE60VlNaVcxlzlr51Dxzi58kzKG97iyol6RjXy9kwyRcmjCAVkGlsZAXWRO7OkjnDeMmCqM9gd9mTIAfS86bcLrHdvmcPNAMDeBFeh9w/kduE5YERSZdNFSrP/aLBQTWwwdLZwrZnjXeDI7zfbvP3kN5T0HIV0zouxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998461; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jmGk5ww52rySfPa3ko3wyuX1izMOGeRMMwZAnOTeG10=; b=njHHa9XANNXmAqkzdRz71JwYdyTr3t9ILfMi1jykUBw25M2/iz3+QZoGrtny/qMPxpFRa03Nu51XST1FEg2Z+mUm6/6UDzNUQzd+88lyfg062D1K+pXxfazCZCQTy5vEnkLbpSSNR0RhrjY+aMDKIAP/1lyfmQkv9pxv5oqK4ac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998461262412.8498238851979; Mon, 20 Oct 2025 15:14:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8k-0005JU-G9; Mon, 20 Oct 2025 18:14:06 -0400 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 1vAy8h-0005HF-H5 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:03 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8c-0006V9-GV for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:02 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47118259fd8so29099675e9.3 for ; Mon, 20 Oct 2025 15:13:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471529598c9sm162711665e9.5.2025.10.20.15.13.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998424; x=1761603224; darn=nongnu.org; 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=jmGk5ww52rySfPa3ko3wyuX1izMOGeRMMwZAnOTeG10=; b=Bfdo5NL/jaFONN/aMQ2fHZPgTQe850lLjILS3WQ1QSYRN8KNZmQF+kVAX9CXyv+fwg MxvMxHfeMRbUOhV0kjBG+bd1swh6hLm70xzUujkIPW3P8/nfyEQ6txfMb8qfKDkU9Tfe lbSgqx9Bp3bhwndrAv71URmPyZgUCqSgjCHqZjt+MzBZvN7HQ/Tsxni+HxDNTEH7t/9x EhuBuhmQT3bXkrrqhg7yU9JCbwwQSuiOcDOrCs0AwZy6qXbFbVtSo0tBfFT/+A7h0EMN kES6q+LuXFF5b43De6gn3ZcmRAWLnMoJlweSdYpOHzRb04yiDNHf9QOaMGXNC4s3FB0E J/Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998424; x=1761603224; 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=jmGk5ww52rySfPa3ko3wyuX1izMOGeRMMwZAnOTeG10=; b=sHexaWZK9PXqe+4c+E2yubR3YjWYLVusXgPTUgWAp4+Unv3qntdSdbi0Rt4hqfJrp1 vbVBAnBHb7a5+FCsN/CLDiY+7i5W5FMRb2fjDo55A2NYQvr4wVAYTO1cT/dP5eRFuGmO 0D+cZ4vWgmXXbS5802GytjvSxO1hOj40yG4XjLHjlpOdHFRGq6NbEhXwBRaMrUoF4R6+ kx0mXUCkpzXdaw1Sff7+GxdlSpow2lxpeDzjNG4dRWRihUtMUKxzytHplUO4i5llssCM wDPLm4+1MHnOGk9PH9i3IB3E+UH4KuuC8IPEX5yiR2AZDvgyYuqbzohSuOD2nkSXLvvk AvwQ== X-Gm-Message-State: AOJu0YzekLdJO0/KmBXyx8ox/dUe80YdAl6zhb+M5XMRVz89MBWFyBGd z7Sy56udS+tOPYTuWibhe0FLYDomcKJ85k3XplYwqmaRYSiRiFZqkxoKlQcKXd7JY7i6M1t5So3 L0UfHg1E= X-Gm-Gg: ASbGncua8vui7QY7EwPULXgRrhP6ca6B8/Eij5vZcrE5Cs+qiKsZN6hFAX66Qsmt7lN ockCx40dhKWz5HV/L7uZSEkHzJt/m36j9lqNA5G/bX3aG1+frnOXo8YSyZBizmwv8IaixaKZAaB Pd/mzQCMn0Wh0tTihvahHVuKnYiumYUhJy1ecsunL81ZRN0xxK40/Uhg9CEXa3+P5lHC7IkuPdU o3NjpQR6raf81u45C1lkl+w7phRSfEujLrt/BUGi7IxK6wPbAJPIu6wb2867FHvexC7PpD4HcKj DgTXTkgsy1A9/0yIPk31bOwaY1xAgCYvErH1NgLXa6mEbmpRI7P158L2A1W/NsXbvak1CEpHHkw TmwIxJ76F9DmKumrVH9LqIdwnEwqSzHALLsF2kRal4YMwyD87Rs8Av/pvdGFJXYxaBCGioS20E1 egK5moy0UpxEK/CvttT/5DLCEd+Sk5GrT1xF6BxYsDKTXs8xnmxfkmD1N71+Ub X-Google-Smtp-Source: AGHT+IFkz0Av3W/g1VhOZxXU6mjDc5TaUKOSOc0zH9wva6/d5f82wvJvMWfD58bsSr17NAceqqtGvQ== X-Received: by 2002:a05:600d:8231:b0:471:1db3:6105 with SMTP id 5b1f17b1804b1-4711db36173mr65383545e9.33.1760998424482; Mon, 20 Oct 2025 15:13:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley Subject: [PATCH 12/30] hw/arm/aspeed: Build objects once Date: Tue, 21 Oct 2025 00:13:17 +0200 Message-ID: <20251020221336.66479-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998463691154100 Now than Aspeed machines can be filtered when running a qemu-system-arm or qemu-system-aarch64 binary, we can remove the TARGET_AARCH64 #ifdef'ry and compile the aspeed.c file once, moving it from arm_ss[] source set to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- hw/arm/aspeed.c | 6 ------ hw/arm/meson.build | 9 ++++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 0cd76b587f7..d1a746e3b0b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -180,13 +180,11 @@ struct AspeedMachineState { #define AST2600_EVB_HW_STRAP1 0x000000C0 #define AST2600_EVB_HW_STRAP2 0x00000003 =20 -#ifdef TARGET_AARCH64 /* AST2700 evb hardware value */ /* SCU HW Strap1 */ #define AST2700_EVB_HW_STRAP1 0x00000800 /* SCUIO HW Strap1 */ #define AST2700_EVB_HW_STRAP2 0x00000700 -#endif =20 /* Rainier hardware value: (QEMU prototype) */ #define RAINIER_BMC_HW_STRAP1 (0x00422016 | SCU_AST2600_HW_STRAP_BOOT_SRC_= EMMC) @@ -1869,7 +1867,6 @@ static void aspeed_minibmc_machine_ast1030_evb_class_= init(ObjectClass *oc, aspeed_machine_class_init_cpus_defaults(mc); } =20 -#ifdef TARGET_AARCH64 static void ast2700_evb_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D bmc->soc; @@ -1921,7 +1918,6 @@ static void aspeed_machine_ast2700a1_evb_class_init(O= bjectClass *oc, mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); } -#endif =20 static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc, const void *data) @@ -2074,7 +2070,6 @@ static const TypeInfo aspeed_machine_types[] =3D { .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1030_evb_class_init, .interfaces =3D arm_aarch64_machine_interfaces, -#ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("ast2700a0-evb"), .parent =3D TYPE_ASPEED_MACHINE, @@ -2085,7 +2080,6 @@ static const TypeInfo aspeed_machine_types[] =3D { .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, .interfaces =3D aarch64_machine_interfaces, -#endif }, { .name =3D TYPE_ASPEED_MACHINE, .parent =3D TYPE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index b88b5b06d7e..98783bbbdeb 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -40,20 +40,19 @@ arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: = files('xlnx-versal.c', 'x arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', = 'imx25_pdk.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', = 'kzm.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) -arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( +arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_soc_common.c', + 'aspeed_coprocessor_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', 'aspeed_ast10x0.c', - 'aspeed_eeprom.c', - 'fby35.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: = files( 'aspeed_ast27x0.c', 'aspeed_ast27x0-fc.c', 'aspeed_ast27x0-ssp.c', 'aspeed_ast27x0-tsp.c', - 'aspeed_coprocessor_common.c')) + 'aspeed_eeprom.c', + 'fby35.c')) arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) arm_common_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) --=20 2.51.0