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=1760998503; cv=none; d=zohomail.com; s=zohoarc; b=FQ4+/jaqQI1mqP3uxm9QjbWjiP/5j2O5NHQ9CSLJtd4Hz89JFi0Cw8Tonus0dBNUSD+b8tui2FoccK8f+bKHiqIMCrSNFbd08QvOWxZgw9KJXT+Tm1Vcycip7mNE1s0oE/4AmKTWU/pUah8vrVFWQ17HVDN4fuvghMp+vsStYhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998503; 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=ZmAHkKRpKe+N+FLuo6CnpsGLNli5rNouqryFJwonxGY=; b=kq+JzbK2jemi5regsRyvcwEjkO2whZuWKadgUkgabqOsXs7odsMwarG0nt+CyTgQzVDC9hNMJgYUQR95PggPMl+eivOyhkcgGx1QzkHEwZhSg0sOGGqT9thEIc6rSq4uaPsKzUqLj+b620OK9nXB5Jyvvh7eTDRD08VhCIDP+qY= 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 1760998503769430.82389388290187; Mon, 20 Oct 2025 15:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8n-0005Lp-OQ; Mon, 20 Oct 2025 18:14:09 -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 1vAy8j-0005Im-Bz for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:05 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8f-0006VO-6p for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:04 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46fcf9f63b6so26395225e9.2 for ; Mon, 20 Oct 2025 15:13:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b97f8sm17020178f8f.36.2025.10.20.15.13.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998430; x=1761603230; 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=ZmAHkKRpKe+N+FLuo6CnpsGLNli5rNouqryFJwonxGY=; b=nxg4Zkuh97takp8ZeBL9nVemGzlPqJDI9YASXZNUKIBSQAOEEw8X2FjeD+Zlo10Gsi +56fdEALCP9ST+rNFhInTbCCoR0/pzKRuKLgdfCobeNpgJ4p20wJfskqffZXkjfYxRoa 82Xj5KrVE9DsyJ5iVpWcQCggUkycV9EHBlK5D/izsujoD3ciKBf9XJUGSd2j2qzUnncs kkitfSge6koLnaJ0aAkEFl84FWZ0yK5zNp7Vf4v+jUT/aGePJDm23rjIgLhSFILBLtkw ewiyxxSRBBUAYHPIyWsktqxjGnAfM0iiXmctovBxudWRQlWs3QHg0NzqurMCWy3aBdJp liWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998430; x=1761603230; 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=ZmAHkKRpKe+N+FLuo6CnpsGLNli5rNouqryFJwonxGY=; b=fuzudAmI2dO6Q8dBXbss0qSHeLNFrJoY5YZ8YnUyxxTVt4brudw78SRWee+7oIvaEY 2Z5L8hped8jkSDsjxVH98mdM0qeSzGf5tli7fWwGTg9EDdozLRm1dlJiKwL5RdASavZA d89CabzOFQLafvEpphaoe1urSHJd8vTMjzOwqbmwN8i4tW0ZtDmonNTQ/dc4l3bv6Ya+ y5c2YVAwGQMxepl5UkudEiFJ3+28QUHvncCISW9o8qebdRSbPIeqWEwWjrzrGeIAWVWD T4F3vlT08Otbph0XeGS2fwRYmn+B9xR3EhGY6OvOQHwfF+YXYiggXaSGf1luTEngQYN3 D0jw== X-Gm-Message-State: AOJu0Yygd6sNaIEVoAZVjD315ShyoEDQodAsjsnmwpijMSeB5I7hfpvL QpuaeeQamK2XMTryzc+dR8ItlJWQgDX6VrEoU+Uh2IArk/NpTwgkssu92oHkjNmyxwQcp8SBf6i NDmZ2eYI= X-Gm-Gg: ASbGncuH9DS07yLrrp/VEpR4FzW5F+wizuHtswbYw7KMrjv5Nf4uTdqiq1Lm83M88jW 1FdGzadraPH2M9tA9N/vgfVF6YB6eyuyvDrFtODBgAUCQ4XpLLMFawgc1Hu3IS3LZFnKeHkIOGV mmFh2I8hCkVFBfXVPeqqh1mwNrE7VFjwUrgioF+aZF4e0BbW1Cjy5w560sZ6azNYJgQ1iJpRPmZ JR3pa8FGko2HBZoF+pcNKy9wBhF/j20VFDbm1b5yTBn3NahxA1ueKoysvp2exx8SdmdFOeuMcp6 afrBdUoPO6s1EgGgiyEp5ExDG03XXj9aV6i+zFsxoq0AnCHOfN/xua3jX+wdYvReA+ficpq//z8 EVWbtWUu4jqLDW2RI80fBxOheAo/6rvWtAwwJT9mTfdVeCgWBxStEHOY5RVHJPqnosN60cZ49g7 A3/+h+VvKZqCr7up3OQviHKGYRDSvPCljC1Q+cOClptYxmvYeKMg== X-Google-Smtp-Source: AGHT+IFuaULPbuETV1FMmN10syysRKvDy3vJkroLpk5zDOa+1hPU2mx5U6AoZE9Y4Vl6eS/bpfKm8A== X-Received: by 2002:a05:6000:4287:b0:425:7c32:d969 with SMTP id ffacd0b85a97d-42704d145admr10331749f8f.5.1760998429944; Mon, 20 Oct 2025 15:13:49 -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 , Peter Maydell Subject: [PATCH 13/30] hw/arm/raspi: Build objects once Date: Tue, 21 Oct 2025 00:13:18 +0200 Message-ID: <20251020221336.66479-3-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1760998506159154100 Now than Raspi 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[]. Note, we expose the TYPE_BCM2837 and TYPE_BCM2838 types to qemu-system-arm, but they are not user-creatable, so not an issue. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- hw/arm/bcm2836.c | 4 ---- hw/arm/raspi.c | 4 ---- hw/arm/meson.build | 8 ++++++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index cd61ba15054..aaaff05624c 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -195,7 +195,6 @@ static void bcm2836_class_init(ObjectClass *oc, const v= oid *data) dc->realize =3D bcm2836_realize; }; =20 -#ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -208,7 +207,6 @@ static void bcm2837_class_init(ObjectClass *oc, const v= oid *data) bc->clusterid =3D 0x0; dc->realize =3D bcm2836_realize; }; -#endif =20 static const TypeInfo bcm283x_types[] =3D { { @@ -219,12 +217,10 @@ static const TypeInfo bcm283x_types[] =3D { .name =3D TYPE_BCM2836, .parent =3D TYPE_BCM283X, .class_init =3D bcm2836_class_init, -#ifdef TARGET_AARCH64 }, { .name =3D TYPE_BCM2837, .parent =3D TYPE_BCM283X, .class_init =3D bcm2837_class_init, -#endif }, { .name =3D TYPE_BCM283X, .parent =3D TYPE_BCM283X_BASE, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index ff5d4368e42..bc9e2b4b361 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -368,7 +368,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc,= const void *data) raspi_machine_class_init(mc, rmc->board_rev); }; =20 -#ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -388,7 +387,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc,= const void *data) rmc->board_rev =3D 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; -#endif /* TARGET_AARCH64 */ =20 static const TypeInfo raspi_machine_types[] =3D { { @@ -406,7 +404,6 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, .interfaces =3D arm_aarch64_machine_interfaces, -#ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, @@ -417,7 +414,6 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, .interfaces =3D aarch64_machine_interfaces, -#endif }, { .name =3D TYPE_RASPI_MACHINE, .parent =3D TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 98783bbbdeb..a12d690ce74 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -28,8 +28,12 @@ arm_common_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true:= files('allwinner-a10.c' arm_common_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h= 3.c', 'orangepi.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-= r40.c', 'bananapi_m2u.c')) arm_common_ss.add(when: 'CONFIG_MAX78000_SOC', if_true: files('max78000_so= c.c')) -arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files= ('bcm2838.c', 'raspi4b.c')) +arm_common_ss.add(when: 'CONFIG_RASPI', if_true: files( + 'bcm2836.c', + 'bcm2838.c', + 'raspi.c', + 'raspi4b.c' +)) arm_common_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_= soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_= soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_= soc.c')) --=20 2.51.0