From patchwork Wed Aug 2 16:44:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 109258 Delivered-To: patches@linaro.org Received: by 10.140.101.6 with SMTP id t6csp3003425qge; Wed, 2 Aug 2017 09:44:09 -0700 (PDT) X-Received: by 10.28.211.193 with SMTP id k184mr4159946wmg.21.1501692249729; Wed, 02 Aug 2017 09:44:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501692249; cv=none; d=google.com; s=arc-20160816; b=uy6h46S5ubniXKuA1/p5PBXqRkjDrFfG7v8U+n+i2wTX+QvKbWi1kBp0fnQCezYZ1s VFZdov3MsbqogMjORAeHsxymgARhDQdMBiMN8diec7VJWPRhmlCBF54K3huIYbhKO2Sh RffQwWdIffV8V1bm8/d6aIftM777F2goEBS9ENLvBFvuYlgtbW2Gg0G6BU69OkwI12nU kmsLZcMarSqUgkw6ebLiuBcic5gUkBT0b2HiisngtFoCyiPZzFh6SIr1v5wvt5R3hlWP ICnV+5WWPDWRF5+JWjr4QS/9f3YxooozijVGqMzi0Blr+MBP0INvQx+egFexwTg/Ydc+ q//w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=suVInd7KYDrTK7MIgJprQgQp7uQFFYRMUUDoE1rTEnU=; b=MPyGP7wLwcmwHQCdUqAozibHrT1fWAtTvvXnjnSjlgIq8OQAX9XqPS89sFQBJrmwUh QKBkd8Kup5n6MLVAO+ZhIhjqIIno1IbdfMDxJReVPUDOLYWOvfBjamXydHFHHr6z1/7k wN2VLJgNrLokxmnVvkNLSRB+KgrnFxqoaoQFkl9sZh2UNUrVXo5LXlX6aaSJLJ+g3KHS /6o75y+g+UyLBZhnZZWbkFQWYBBpzO1n0KW/p5rObwd3fmfJF4JgjT+VbFAui5rbwhwv SeMsniAfwiHvpkKfy5UkZIB8yNaGlElpDSukefj9Va/w1sMyvu6555okOcAVgSzekB1b XuKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id g14si3495077wme.258.2017.08.02.09.44.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 09:44:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dcwkj-000417-AT; Wed, 02 Aug 2017 17:44:09 +0100 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 14/15] armv7m_nvic.h: Move from include/hw/arm to include/hw/intc Date: Wed, 2 Aug 2017 17:44:00 +0100 Message-Id: <1501692241-23310-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501692241-23310-1-git-send-email-peter.maydell@linaro.org> References: <1501692241-23310-1-git-send-email-peter.maydell@linaro.org> The armv7m_nvic.h header file was accidentally placed in include/hw/arm; move it to include/hw/intc to match where its corresponding .c file lives. Signed-off-by: Peter Maydell --- hw/intc/armv7m_nvic.c | 2 +- include/hw/arm/armv7m.h | 2 +- include/hw/{arm => intc}/armv7m_nvic.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename include/hw/{arm => intc}/armv7m_nvic.h (100%) -- 2.7.4 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 343bc16..5a18025 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/arm/arm.h" -#include "hw/arm/armv7m_nvic.h" +#include "hw/intc/armv7m_nvic.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h" diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index a9b3f2a..10eb058 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -11,7 +11,7 @@ #define HW_ARM_ARMV7M_H #include "hw/sysbus.h" -#include "hw/arm/armv7m_nvic.h" +#include "hw/intc/armv7m_nvic.h" #define TYPE_BITBAND "ARM,bitband-memory" #define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND) diff --git a/include/hw/arm/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h similarity index 100% rename from include/hw/arm/armv7m_nvic.h rename to include/hw/intc/armv7m_nvic.h