From patchwork Thu Oct 19 13:35:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 735563 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp1519440wro; Thu, 19 Oct 2023 06:36:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFy4ZQw54uR5xd6bHqNVsg+qdzNbCrTQyUzSvgEo7oyzWuYtKclQuMY8sxVxMencanBuhe X-Received: by 2002:a05:620a:288b:b0:777:5120:d5ba with SMTP id j11-20020a05620a288b00b007775120d5bamr2125352qkp.8.1697722593008; Thu, 19 Oct 2023 06:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697722592; cv=none; d=google.com; s=arc-20160816; b=TPbERUY9wWvrvqrRxCXid8vmlHuLN52Im4ywzsHhrmTLGn/BECFweYn1cUi8nvG9Y5 YnIMUs3RiTSR/nkBh8Gny97HZ0TKTIcuQU0kWJeh7r9BWYjmK3KP3ktc6WbWURZ5h7w9 Zvd58IXRzFNbbSg6JYZDy2NffMalF+edEJPDY9EMq8WNkP/hCz/vn0Prc6CKhPNaryLX AmKLdcmrNGeaT+Y249zwkxJQ8XRY+zkEhCtjgYRwynOiZ+kB2o4/E2YnvhKT3saaZYS8 ubQUlkQgX35ZLwCINLa+e5dnT3UoCNMC6FLA14eg16wfWTiEzOpo9mjO9axRrDdY2ZpA MUZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from :dkim-signature; bh=noOMC59/VFc6YCvUNgWuu27WqlcssERYUdLCM7PlKVI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=b+SVJ2uZrQmWYdTUqC3TrZf1aXZqHm/Gn0CrxITwwgO3shbq1Hg3VnUjuPr30bkFKV DVW3GHrMvaZRQ5ze35Ycriuo4N1y8h4/SdvDxDWYPz4qI6vMSydBwYXvzmsoYwqY/JIa wuUvFqrGraeJukow42s//XnJDbSLXsVwUpoANVaoTNahVURegV2ktHJgBHedhKT6X4Uk ljaqGh7No2IBSuQ64C8SpKXQ3Xukwvk2pAbCHzGmRghoNmtpR8jFqo2AiyAFx5lusUYC H9GaHHA4x0WMPo7lqnD0T9+XGo8zI481p2h9qQto+u8NilGL7VhFFnhobQQMhwujDcj0 u8Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OdMaF6pk; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 25-20020a05620a071900b0076af62a09d3si1554979qkc.537.2023.10.19.06.36.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 06:36:32 -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=OdMaF6pk; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtTBj-0001qb-IU; Thu, 19 Oct 2023 09:35:48 -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 1qtTBf-0001pL-OF for qemu-devel@nongnu.org; Thu, 19 Oct 2023 09:35:45 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtTBd-0001C7-0S for qemu-devel@nongnu.org; Thu, 19 Oct 2023 09:35:43 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-31fa15f4cc6so6754453f8f.2 for ; Thu, 19 Oct 2023 06:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697722539; x=1698327339; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=noOMC59/VFc6YCvUNgWuu27WqlcssERYUdLCM7PlKVI=; b=OdMaF6pkzMwJpiHx/c6woTs6lx/Rm+pt/Q5PaHpuHTT/od+sy2zaujcbA+vG3xfRPg YAtYPX4txNTYSAxFRHvPu6Ywye/DhW8mYjOAiqs8MPgDYV+4QbkLKgQmQvKqHBHoBde5 KM9+3iLjqQATquavxaf2SHu866HKGNLqUBnWSzA/BZmFkislB+hgTJeOuBZbsKJBZ17H 5Qhqq0yZ15ZgS5HQbV5NxW8MKXEE7uGfnw0dmydmK96wvCRzz9tTkfdg01Can53rULon rdEq4n2j5JenUtTTAa6gHyT+pSHY6m6Yo9zsXT3Kp4Q/5DCWk97RH1Zp/HptMvjiy8ex eX3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697722539; x=1698327339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=noOMC59/VFc6YCvUNgWuu27WqlcssERYUdLCM7PlKVI=; b=XYrmIoP0OiNhDRUuIQr6AyIXsXiX/trBhyfGeO8lfXn4XdpbUavmNV9RXn1HFL/6GT xS9+kkNNtnuZFqxEdXJ2u/LacPbwChxDdw13vi+NcOo3S43DZR+FPM7N4y2LW0Duvg7S ej0YebpqFKLa9HzTAm59gOrMuXU5wWfnmXnrNNe+lMO1h4o4kzPpjhGu1VoQCoEC45wU zT7CuSp3wlfx3r3BUkHkT5W9JyiAJ/mlLYWxN+8bG0D5WImXysWXmXmB5gLJUzd49lem i//YMhcKXnGX7KcuH1NHkfLLeM2R7cyXpLMPmECKHMv5vrZ2hbr8b9Tww4r+DZ20Dv3M zMmQ== X-Gm-Message-State: AOJu0Yz6rQV/nyIoWJ9xkBNzoPBazht/ZgcVLtbK1l3koYEVw3b7EahQ aS3BJIHj+zcAWhdHvRRGxaWGwJN5gA63J2qP8jY= X-Received: by 2002:adf:fdce:0:b0:32d:b06c:d30b with SMTP id i14-20020adffdce000000b0032db06cd30bmr1426737wrs.55.1697722538997; Thu, 19 Oct 2023 06:35:38 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id d28-20020adf9b9c000000b0031f3ad17b2csm4512690wrc.52.2023.10.19.06.35.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 06:35:38 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/24] hw/arm: Move raspberrypi-fw-defs.h to the include/hw/arm/ folder Date: Thu, 19 Oct 2023 14:35:14 +0100 Message-Id: <20231019133537.2114929-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231019133537.2114929-1-peter.maydell@linaro.org> References: <20231019133537.2114929-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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 From: Thomas Huth The file is obviously related to the raspberrypi machine, so it should reside in hw/arm/ instead of hw/misc/. And while we're at it, also adjust the wildcard in MAINTAINERS so that it covers this file, too. Signed-off-by: Thomas Huth Reviewed-by: Alex Bennée Acked-by: Philippe Mathieu-Daudé Message-id: 20231012073458.860187-1-thuth@redhat.com Signed-off-by: Peter Maydell --- MAINTAINERS | 2 +- include/hw/{misc => arm}/raspberrypi-fw-defs.h | 0 hw/misc/bcm2835_property.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename include/hw/{misc => arm}/raspberrypi-fw-defs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9bd4fe378d4..9282b4b0f55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -885,7 +885,7 @@ S: Odd Fixes F: hw/arm/raspi.c F: hw/arm/raspi_platform.h F: hw/*/bcm283* -F: include/hw/arm/raspi* +F: include/hw/arm/rasp* F: include/hw/*/bcm283* F: docs/system/arm/raspi.rst diff --git a/include/hw/misc/raspberrypi-fw-defs.h b/include/hw/arm/raspberrypi-fw-defs.h similarity index 100% rename from include/hw/misc/raspberrypi-fw-defs.h rename to include/hw/arm/raspberrypi-fw-defs.h diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 4ed9faa54a1..ff55a4e2cd2 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -12,7 +12,7 @@ #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" -#include "hw/misc/raspberrypi-fw-defs.h" +#include "hw/arm/raspberrypi-fw-defs.h" #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h"