From patchwork Tue Apr 22 14:54:52 2025 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: 883000 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2457517wrs; Tue, 22 Apr 2025 07:58:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHTioay4k13yYkw1yMV1pHKEnaRx8NXAVU8UX7xv/Xk1fWYrce9t4ibt+Is//rKhHTdJNt3A==@linaro.org X-Google-Smtp-Source: AGHT+IFlIcn7Vjij5FI44aFUdtx3CFZMTSzm+rY/1kP77OUXeV05aanX/HsH0yXOzlwyZgz6U5GY X-Received: by 2002:a05:620a:4094:b0:7c7:c77a:81c with SMTP id af79cd13be357-7c92804d204mr2396459585a.51.1745333909825; Tue, 22 Apr 2025 07:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745333909; cv=none; d=google.com; s=arc-20240605; b=ENamN+pJaGOE+eDh7iBzSx+eACq0Z9Rep9Gxr6cFjlt/Bo2bdFIn0gcGx++MgtrGyT X4deiQouSg93Wb81+nsvbTPo3kcAIA85luBPa2vt6WN0mDrUpQenT9MGDb+nSFvOpgmD fHyORL79705DaSSCC+GEPY6KdNQN34ek6xNSfYsIpsCUpftbGh0AfQxRSuR4+Udlgc96 brmKV6zllNYeNbcSVh09JXSPKvcVLklQv6cBMfBZimpCL/vsDBdpKBRfMvFLFy/BioLg hWJ77IPLw5MzCJq+MzN5CoqhfQrMELeadjduCIgARVOoPklIXHB7Zuhqy3mrnWViNTLM 4+fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=G4RFN5FOuVixNxaWmi5JCm+O9iaME+14SHqI7R4pYTo=; fh=98FKcUbfHOMAWlQQi9/5y14VVYgcGa56vjU1mKYkvXI=; b=Fmm2qOx92vq+VWFMT1MGgBmE7+ZyzCzTXr5CsNd3BW1JzhcISNjRauu+yCVq6hHoEb +qkIY5X0ELmVTmNj6wdzABJg8JnJVNrlNf3s3C5FOACL5LFrKZqsZYweKGvj9z/v27W4 nQIoDMGInYorIPbJ1YRXepZ4m4HpUYh34OUbiab7gkFqT5A+soZGV1nv2ZAfdmIDyUn+ kjZjrtcQPNXtykOtzIsAeoLivkKVsi+SJkDNbSxQuWGZW8iA9mCu9Ydhi025AhonOcQc KkEcZm1NowYvumx8RRW3Yrdo/iMSpFDkRh1VRdJ7x9F9GYK8drw90DjjuX7LDVhgMHqV RJGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tt0cOlNm; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c925b7f7aasi1089466285a.263.2025.04.22.07.58.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 07:58:29 -0700 (PDT) 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=tt0cOlNm; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7F2T-00073F-Ti; Tue, 22 Apr 2025 10:55:58 -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 1u7F2R-00072g-Hi for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:55:55 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7F2O-0005EG-Vi for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:55:55 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso25481775e9.0 for ; Tue, 22 Apr 2025 07:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745333751; x=1745938551; 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=G4RFN5FOuVixNxaWmi5JCm+O9iaME+14SHqI7R4pYTo=; b=tt0cOlNmEj4AMDQTC9EHAvpOsYIovqWbGnFRmKPOELNv7ZfD6E2qEiyHc9W9Jehhqd 6g2dop00CfqAQvTib3hSk3VpHmqiSa3TOpbprr0qHm5wVsc5nBxgmCGolMetiOCQ+m75 r3UV7PrBv+UIqFaoqCYVOwVKfuDsSiZSOV38lehRNxbFvj2VbbHJ0VCgzlW1SEIDEgyb n+Ebq3s7Ar4EjemUHY4GaXkoaGGGm27N/tVbpUEe6lSacTQfWIn53Nf5Q+M3K9mhFc/b yd/9PrX78o4/chpe3S3pfckfNcLD0wqPkEcE2M9/2P3o+HX9u7bWoFh+JYPyOvDbJOHv QjqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745333751; x=1745938551; 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=G4RFN5FOuVixNxaWmi5JCm+O9iaME+14SHqI7R4pYTo=; b=hCJTTkcojuNL3z4yi++n/HDUu978IjojvmOPB5UvQPJZIBxhByqb0HXAUFV/DlSfMd PVDbdmkawwHPUYJSEiUPrSMf5PUJG+IInWck4vAv1mIS63q+HcoSuz3xUjWyV95edbMI DqldmWq8j1/yAwqKb9ynwnITzIm7nDhzxN/SeVNbG2Wans6trafQ2Bgy/txTHERLVc22 5Q0bwhQst/Y4kdRJUgjAE0H1nDBAHotaFQBR9ZvYRwycSdWofGoxtjVxDlHLrqDw6uFB ZYnfHtUts0OadFFTqclFilDfYmAwxN7OANlacu+Ig/2VQrB/aW2BmSsp78Lm89PUsoiR Fhew== X-Gm-Message-State: AOJu0YxsGJq02u6RZthEt1uGmV2TkUjxZ8803HeiAYfF8z6SBMosJ53T miMlBSFO3IkR8u8z/zM7coqtx3PvVPdjkjPMS6YiMfnH3ECWavw8dLVnFtj4XPlsIdtXSIH+g9m f X-Gm-Gg: ASbGnct9Rbt9hU3y4NsXuwfRhim+GEOZm5gPr2zAVda5g0q0ZIKqPXvRvxn0J6remvh bF8zMxCkpUaZtRRBm73NiFcAXoNpRL0Hf9+jyOA4w3mHmSoa2RXSRz1EUblLaIM45W+vDc87EyD g8am83QcIZs+Ik+OTyCVBVDUppnmFmNh+JpTiY7kPnuNy5ROQIgR9TsRiOPwDkOTsvKVrmw+Qdx ssJNuOIOcI7hq9jTwoUi+W9YQH+uNt5/zxGcSDwX4R5nhhw48pmHaWw7O/xSGFlxemhWEWC7T8b RBx/YXYhCYCL9qL7QglzMVyYDCDtrhsNWHdPsDugezVQWi99Fp9V+n/StLB6/TBMHZmZlr+CBhw Fa4g4BoUQqqeh4V4= X-Received: by 2002:a05:600c:4ecc:b0:43b:c0fa:f9dd with SMTP id 5b1f17b1804b1-4406ac007b8mr126898025e9.25.1745333750855; Tue, 22 Apr 2025 07:55:50 -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-4406d5bbcfesm180029645e9.23.2025.04.22.07.55.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 22 Apr 2025 07:55:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Pierrick Bouvier Cc: Richard Henderson , Anton Johansson Subject: [RFC PATCH v4 10/19] hw/arm/raspi: Build objects once Date: Tue, 22 Apr 2025 16:54:52 +0200 Message-ID: <20250422145502.70770-11-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 type to qemu-system-arm, but it is not user-creatable, so not an issue. Signed-off-by: Philippe Mathieu-Daudé 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 f60489983ba..454ea2208d7 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -196,7 +196,6 @@ static void bcm2836_class_init(ObjectClass *oc, void *data) dc->realize = bcm2836_realize; }; -#ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); @@ -209,7 +208,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *data) bc->clusterid = 0x0; dc->realize = bcm2836_realize; }; -#endif static const TypeInfo bcm283x_types[] = { { @@ -220,12 +218,10 @@ static const TypeInfo bcm283x_types[] = { .name = TYPE_BCM2836, .parent = TYPE_BCM283X, .class_init = bcm2836_class_init, -#ifdef TARGET_AARCH64 }, { .name = TYPE_BCM2837, .parent = TYPE_BCM283X, .class_init = bcm2837_class_init, -#endif }, { .name = TYPE_BCM283X, .parent = TYPE_BCM283X_BASE, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 69cccdbb6b1..641e231db61 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -368,7 +368,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_init(mc, rmc->board_rev); }; -#ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -388,7 +387,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; -#endif /* TARGET_AARCH64 */ static const TypeInfo raspi_machine_types[] = { { @@ -418,7 +416,6 @@ static const TypeInfo raspi_machine_types[] = { { TYPE_TARGET_AARCH64_MACHINE }, { }, }, -#ifdef TARGET_AARCH64 }, { .name = MACHINE_TYPE_NAME("raspi3ap"), .parent = TYPE_RASPI_MACHINE, @@ -435,7 +432,6 @@ static const TypeInfo raspi_machine_types[] = { { TYPE_TARGET_AARCH64_MACHINE }, { }, }, -#endif }, { .name = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index f76e7fb229f..f52034ff6a2 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -27,8 +27,12 @@ arm_common_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40.c', 'bananapi_m2u.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'))