From nobody Thu Oct 16 04:15:39 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=1745333805; cv=none; d=zohomail.com; s=zohoarc; b=IgkCZZWYNc34PAlpOa/2yjBRiVntDiPtE5lo1rvOxYZiPaCHoN9KtJgBmKbwCnxy9V/rQIfjd1DFp1vQ0l3I7IBqnN/RAK0Q/DHGN5FCMx6NddO3GVu/T2qFPqE7cho4ooSnmMM6gA0ASdZXKY/AgfWN0eE8vh4YR2iq5jEnw1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745333805; 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=MPk7GJ/Q7Awhqe4M7LOu5PgmoZQozcGdMhSTLUXghio=; b=Ipjx8XxxTp/TwB5FXtmlwe+I7i0vl6y8Z0Q7nSFPA+SlC9z7UTQSf5z1+9zvqerc5+VcCS2JJ5yRF9E7VPZP1xi4QrbtgR8+fxFDkxQurh03zrRTgvB7wNjtuHn1/uj57Rlx3KTsAY5Xx/KUoA6+qW5w7gI8k1/RpV+SG/FJ+qc= 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 1745333805632413.92584577445405; Tue, 22 Apr 2025 07:56:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7F2Q-000705-5Q; Tue, 22 Apr 2025 10:55:54 -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 1u7F2M-0006vD-T0 for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:55:51 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7F2K-0005Dd-PU for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:55:50 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39c1efbefc6so3269419f8f.1 for ; Tue, 22 Apr 2025 07:55:47 -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-4406d6db131sm176258285e9.28.2025.04.22.07.55.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 22 Apr 2025 07:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745333746; x=1745938546; 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=MPk7GJ/Q7Awhqe4M7LOu5PgmoZQozcGdMhSTLUXghio=; b=JtpCxqdOjhWWHD8tE1zsP3daosMbTYHZ60fbmsy1ejgt2oxGpfADL1aov6tjvXt5Jy P+2e1lcBfB8KYJFp4S2jyF/aZLOKSqoCyxVGlpcSOnkakznxTyE0gWvjio1B1YKoj04A XGJUFeLc9GnHVLo0ttpI7elAb254CZlw2JYR1thVtRa9Og7rBUCS9HR2ltWztDg3VAFk qtLB0QaYvC++fjyzsQszJgSJ7uHYeDHqDMrqFC3scbrFmpBCM/NQOeU+azPpxCn3na9W 311Rp5BQYR1S76xz0Jg/YSYVfVI9stMHc0pI5H6ZsTFx8yw4hDUMg+6bObWSnRZx3YxE gz1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745333746; x=1745938546; 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=MPk7GJ/Q7Awhqe4M7LOu5PgmoZQozcGdMhSTLUXghio=; b=ELVgBcqb6kDkuNaFWddO2YRaaeogmO+NBfY4lV7uz84wx6tvYtMyc1ICVb8mDMKHwj 2W/TJGX9lU+L8zoiG5Cu/j1HJJxZr98zR6I7y/xkDFZgSRD9qZsiUjt0N4ULfahOo6uP HTycVOhVaB/BAxy16DffaY4PhSLgCHPOOiurpuuIFtEdE08DmK+wK6wgXB4JXRU5+1An M8AVo3YXDtj9G61Ld96EGbGgzINxmVFNjk6aVut0Up/o0gBuE29Pd5cW5OIHBOTQhqyC 8DrqeJHSBW3x8iALeWUX5ky+SWVbA9PFOdWVg+Nfk9BAz7S831G3VcFrKBu2o7joYH92 RcKQ== X-Gm-Message-State: AOJu0YyRicMwsVcYaJBdaJNBY1pLaWkoiFv6h9MaZGX3npHq2U301SFI 6mz07HcFI4xrpelQ2s1Ii74/OHrzHQDeWU7Dllec4LJciVNJn8WW3KJwxvDGbp61dLQaG3ntqaU 1 X-Gm-Gg: ASbGncvLok5hKO23OoTh1ENcR8Qway+2nqY7M42NCewE599G7sbAXEgNnNCn9Y3Ps7g ttzzJK8+PaWVoiutU/fqWhqbGiZ1aU3ibrHQWohMV0UGoUMR3sEIBv0XyS11yQJ7/7xSUBlYkRq LWrmtAGNmn/Z8hv7MM3/Ftb7g1XhhKeGe4+J3efMNc39ixX30qwxpZ0K7HmKUrOIQRGgxaiB0ts f57Onfj2AlDfS/HqxVWfmZNCtyUuT0TNghINn4VWApogEbM6N5RzOqk/3wkOGC+lpTpIQrPDfiN go7gCs31z452mmH+w67NLv632S69DSqGbGp8pMcPNBnwjzL4HcGwZ3fK18BtiC6fEUMmiZ0llMn ztAvu81ki64IbAws= X-Google-Smtp-Source: AGHT+IEuIrE7Zd4KN3z0t/6CgZTpwCxx+i4MSYvofU9FDq4EPQLcXcewzcxMXSOzdGdzxkBRxdQm7g== X-Received: by 2002:a05:6000:400e:b0:39e:cbf3:2660 with SMTP id ffacd0b85a97d-39efba26294mr12321098f8f.3.1745333746355; Tue, 22 Apr 2025 07:55:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Pierrick Bouvier Cc: Richard Henderson , Anton Johansson Subject: [RFC PATCH v4 09/19] hw/arm/aspeed: Build objects once Date: Tue, 22 Apr 2025 16:54:51 +0200 Message-ID: <20250422145502.70770-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250422145502.70770-1-philmd@linaro.org> References: <20250422145502.70770-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::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: 1745333807319019000 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 | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index ce4d49a9f59..6de61505a09 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) @@ -1664,7 +1662,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; @@ -1714,7 +1711,6 @@ static void aspeed_machine_ast2700a1_evb_class_init(O= bjectClass *oc, void *data) 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, void *data) @@ -1937,7 +1933,6 @@ static const TypeInfo aspeed_machine_types[] =3D { { TYPE_TARGET_AARCH64_MACHINE }, { }, }, -#ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("ast2700a0-evb"), .parent =3D TYPE_ASPEED_MACHINE, @@ -1954,7 +1949,6 @@ static const TypeInfo aspeed_machine_types[] =3D { { TYPE_TARGET_AARCH64_MACHINE }, { }, }, -#endif }, { .name =3D TYPE_ASPEED_MACHINE, .parent =3D TYPE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 09b1cfe5b57..f76e7fb229f 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -39,15 +39,15 @@ 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_ast2400.c', 'aspeed_ast2600.c', 'aspeed_ast10x0.c', + 'aspeed_ast27x0.c', 'aspeed_eeprom.c', 'fby35.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: = files('aspeed_ast27x0.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.47.1