From patchwork Fri Oct 27 14:39:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 738682 Delivered-To: patch@linaro.org Received: by 2002:a5d:5101:0:b0:32d:baff:b0ca with SMTP id s1csp473185wrt; Fri, 27 Oct 2023 07:43:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFM5CvrwTpFW3nStCUKyHWOxZrkQHky707K56SIfbnC+vYekgkzitJcNKtvSoGphTx742Rw X-Received: by 2002:a05:620a:4046:b0:774:32f0:e2b5 with SMTP id i6-20020a05620a404600b0077432f0e2b5mr3629975qko.9.1698417786441; Fri, 27 Oct 2023 07:43:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417786; cv=none; d=google.com; s=arc-20160816; b=WBnddD1wtayMld1rNqcFdiu9/t3gPnIiwgD10tiJIW5gTE0GJsTfbLJMS0EOPOAjNx 46xJilsimknt+QGQ7Svds6Wq3UiDRZcnuUXhSCcu2FFqQY4/rCRJmZfY9lQujaysS8Qw Fa7PVqE/XxPhLMpWNUUDtc2ih/nrJk8wWHrn2a6CGDHzyxyYs3nb2OSusetaWOm/1t+a 21b8OObeGwl2MQaV4kGo+YBhoDIWh04NXiKMDrWd6pGzedRA5E6uNCTkP9yrH0ouSMic K4KQM7qipsBMSZsaiOTk2GrwwW08PYHfESIMP0oJTJk+lc4MYctuxu/ldX5Ffpl8bIeL +EXA== 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=1yXp5lXsBt0uFwWt6pWnQ2JZi5Tqj/E4wJ1aMNhTymc=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=WwMvNXt8hY0UAZcPvTPGeb9zbYmHR35ISLDShhVr7qvMQiJjkbJZ0N6zKx/rFB98fM 7drDfNB/GTFN0jFDjlLLJNuOo/glgdXYfYgSwdbp3wA/m/9ueZC2PBMcicN5AkT1Ye8L sieOjZidKxLG/RPZMt9y33LX5DinGJSmuYmP7x8vby2lBihbMG0IVWJoLoNngNaAHSbm WPodK0gUgBU6ilZ22WK/Wxe4zY1SZ5Wfjx1TnwSwzf2UTBsM9jh/6+w8IizO6m/icb28 RroeXqlUv+f6iINknwetEUfPSdnHrdUyzWoOh7BRJ1DtFYWyLgS9uq4wYalR1ACEpsJM hIxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ab4JXCMk; 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 os27-20020a05620a811b00b007777f01f8e7si722308qkn.575.2023.10.27.07.43.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Oct 2023 07:43:06 -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=Ab4JXCMk; 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 1qwO0o-0008Ol-Ao; Fri, 27 Oct 2023 10:40:34 -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 1qwO0A-0007FA-RZ for qemu-devel@nongnu.org; Fri, 27 Oct 2023 10:39:54 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwO08-00088w-A3 for qemu-devel@nongnu.org; Fri, 27 Oct 2023 10:39:54 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-32dff08bbdbso1472825f8f.2 for ; Fri, 27 Oct 2023 07:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698417591; x=1699022391; 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=1yXp5lXsBt0uFwWt6pWnQ2JZi5Tqj/E4wJ1aMNhTymc=; b=Ab4JXCMkGc4hyCk1oRwzssVTDRJ19l7iowGYI+akFIGMZnSA0jEt+NAdT6BSlVdapI /trlgSasPaXlG61fm9uhLz81S55slhdXRvro8OZ26WkOGEHhI5Xu+2GN3oRSA2/9EJPS 7rAwSKkIQtO6Sk/iNq1qjAugN25VAXRoMeR0SXHGRqQg6u78kV+VqODqr58RxHqS/W4n 4clDX5ABSNtoEZHy/nOGtjhsiNMw2iIO3G7euQrzHLWpSwN+5s0D7AwtNqKiKTm+iIzf qYlaxWHNpoOVdGQmMOCHJSFheQ7IOchdMXqxVPgdinNWEUQ2lRPVEwEXww/Oi+ZjVRxF SgQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698417591; x=1699022391; 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=1yXp5lXsBt0uFwWt6pWnQ2JZi5Tqj/E4wJ1aMNhTymc=; b=Eze4YGeQlGKKsjxAbKK75KCq/WlZvKCjTEHWz8d1P4hO9LP/xD5CpmpPetn9MolV3f yLXd4HUE084hdIQWs4PI1NeqbUOu8HJaIphR1rptR8ltXxoClaHtlTDAa9lhOY1ZA1fV H+mWDzxEMCcoJ20JteOGj++VdasexQVdTB0E9TIBEuI+InRQTS/U2jKRn75Vz0EhSKqp mJstXDOSrxv9I75aE7g9mbe3R6gsH86tFgCNaxSHwwD3YmmpFMCL4R9RS/RnxFzx/HQM 9G93d1Eia/wPBiMn9GODQqAa1ulb0KNSVhyTshPEBDAv+SLBQdsRB7hWG9Udc8fLRmjM jRNQ== X-Gm-Message-State: AOJu0Yx/AyTYZ30OI+upP3BvShw11bhm9XhJ0dndkn48m1Vfac0xajBx pJ7GD0cE4fBUVNOdn+Wn1WI410QFmj7e8CF4j0s= X-Received: by 2002:a5d:6749:0:b0:31f:fa38:425f with SMTP id l9-20020a5d6749000000b0031ffa38425fmr2568817wrw.9.1698417590933; Fri, 27 Oct 2023 07:39:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e2-20020a5d5002000000b0031c6581d55esm1874123wrt.91.2023.10.27.07.39.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:39:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/41] hw/arm/fsl-imx31: Remove 'hw/arm/boot.h' from header Date: Fri, 27 Oct 2023 15:39:15 +0100 Message-Id: <20231027143942.3413881-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231027143942.3413881-1-peter.maydell@linaro.org> References: <20231027143942.3413881-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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: Philippe Mathieu-Daudé "hw/arm/boot.h" is only required on the source file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Luc Michel Message-id: 20231025065316.56817-6-philmd@linaro.org Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx31.h | 1 - hw/arm/kzm.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h index c116a73e0b3..40c593a5cf3 100644 --- a/include/hw/arm/fsl-imx31.h +++ b/include/hw/arm/fsl-imx31.h @@ -17,7 +17,6 @@ #ifndef FSL_IMX31_H #define FSL_IMX31_H -#include "hw/arm/boot.h" #include "hw/intc/imx_avic.h" #include "hw/misc/imx31_ccm.h" #include "hw/char/imx_serial.h" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index b1b281c9acb..9be91ebeaaf 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx31.h" +#include "hw/arm/boot.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "exec/address-spaces.h"