From patchwork Fri Feb 1 16:06:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 157287 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp652293jaa; Fri, 1 Feb 2019 08:36:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN65lLPho2Ztq6NRUTKgbIqmE3pzDGycRFHXUbzvF/ZP8I9a5Zvt2+g+wUkuhPPOt48haIzm X-Received: by 2002:a25:9001:: with SMTP id s1mr37259472ybl.493.1549038977855; Fri, 01 Feb 2019 08:36:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549038977; cv=none; d=google.com; s=arc-20160816; b=VxMhhXKy52bRQL+YSwCyYAIRLVlhspXa8h+kXVOpgOZ4OAz7eU2tQFW+DCB9GUA+lO uXjLnOHNdmflR+0/FIy0gwZOn8elqCbGQkePBe8Wm1YNptpGjNRYQoqQs2OiWQojIY84 BbKmRYdmvWnrkT/0qIkaEqQ55lNoqYD1yQSxmpycQxdUXt0hwJ3DAdumt9P2vSsE5q+m MIE0KATeauPXVkxKB6Czh62ago78LSgn09XV5CkFyBhyddqo9eU8sVF8fv0MlqTTelHL BwDQHFjYDya7hSgnOm3uapvMlINCaETEOUjReXbIjBKWfU1NHxDhTidYH+Xxi50h1Vgx 7YwQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ydTQH9oHZww72bt1Pas+HWASYyKHqdI6xq1gYcUqcyc=; b=Xq7Fgm4SPH1r9HmU4U0jSVnshoIblC+tKquMNKcyF+UaQh27Hl9nskKApep9356DmH oESORgbBxzePDM27swE5Vm9jyXycuY/I8tPb2uOR2fZdXrUhEWNF/bPytWZZ5aNoZzMu JwkTyxNbw8YZisn3m3GJzyH8Ym01xSDdXMwYNWgybZ8iySqfTgyzReK41pRfe/bUAN0j WMD25bSbHy5r1neF/v5za5PjGqDAyLEGsXZov5mlkNl+3L9PMyQ8r8Hs9Trp/1/xM5hk 4BOyzofxr3BqEoRJemrHJMtpwvf5o/Mjm4sx0D/K6x3MseEkKPeN2kmFiQ9BgljzU5ww doIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Gyt2jtp9; 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=fail (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 n28si5255296ywh.365.2019.02.01.08.36.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Feb 2019 08:36:17 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=Gyt2jtp9; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:57623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpbnd-0005qI-9D for patch@linaro.org; Fri, 01 Feb 2019 11:36:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpbME-0008H2-4T for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:08:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpbMB-0003jk-1i for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:07:58 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:55992) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gpbMA-0003JC-LC for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:07:54 -0500 Received: by mail-wm1-x334.google.com with SMTP id y139so6605566wmc.5 for ; Fri, 01 Feb 2019 08:07:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ydTQH9oHZww72bt1Pas+HWASYyKHqdI6xq1gYcUqcyc=; b=Gyt2jtp9hwWG8z7ebMrn4DInsrsypoEtW28ahrih4jFjnRJwc+sN94NsQQWfDafakl Z1Kkk40ZeT4PLVUr5mMaQM5QWp65OJ2NXj3Y+XFia/wVukkdyWFtjmel6R8TWh1pC7Z6 cQnDw2VNxwdkXTdqu8VXxvpIujs0koVDsTP0s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ydTQH9oHZww72bt1Pas+HWASYyKHqdI6xq1gYcUqcyc=; b=J27OWmA18JJiR82S1F93+frH5tHJ0spI+jHvyewNznmpbWOIDOLusqmRG8rq04AxqR H1yBNVdduwGLvbC85GmXCZtbRGlDTSk/HXEMbszIOndGMn17Xs8D+0dWzvGIAsvy53pv XN7kk+/ZH8dIdWgt0ePEugsQTNh/bbWP0xDe5c4b4thMmGpZ7goeFnpvlFIMIO0FaY9U U8U/TASHY5e0r/Eh+jFQhxD2OwFUJCej3LJEcpdo2gmZ1LfEElklTj225NYftRyb7bwy gyHx5qz/s8xnN4wCEIVTGR0Htsol/6IsejQclmW872m8t1wX3Aq38lEjvnAtI4piUNej Vk1A== X-Gm-Message-State: AHQUAuaSXzUDVkgms5oZWzFwzoYzywKwIBDUWOngNoeflw/OHJG3032Q LEbk704I2lLMmF5qPq2fO0tdqFw6ujlZZQ== X-Received: by 2002:a1c:790c:: with SMTP id l12mr1638200wme.11.1549037227309; Fri, 01 Feb 2019 08:07:07 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n6sm2847250wmk.9.2019.02.01.08.07.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Feb 2019 08:07:06 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 1 Feb 2019 16:06:14 +0000 Message-Id: <20190201160653.13829-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190201160653.13829-1-peter.maydell@linaro.org> References: <20190201160653.13829-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 08/47] hw/arm/iotkit: Rename files to hw/arm/armsse.[ch] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Rename the files that used to be iotkit.[ch] to armsse.[ch] to reflect the fact they new cover multiple Arm subsystems for embedded. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20190121185118.18550-8-peter.maydell@linaro.org --- hw/arm/Makefile.objs | 2 +- include/hw/arm/{iotkit.h => armsse.h} | 4 ++-- hw/arm/{iotkit.c => armsse.c} | 2 +- hw/arm/mps2-tz.c | 2 +- MAINTAINERS | 4 ++-- default-configs/arm-softmmu.mak | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename include/hw/arm/{iotkit.h => armsse.h} (99%) rename hw/arm/{iotkit.c => armsse.c} (99%) -- 2.20.1 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 50c7b4a927d..22b7f0ed0ba 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -34,7 +34,7 @@ obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MPS2) += mps2-tz.o obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o -obj-$(CONFIG_IOTKIT) += iotkit.o +obj-$(CONFIG_ARMSSE) += armsse.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o diff --git a/include/hw/arm/iotkit.h b/include/hw/arm/armsse.h similarity index 99% rename from include/hw/arm/iotkit.h rename to include/hw/arm/armsse.h index 521d1f73757..ff512054988 100644 --- a/include/hw/arm/iotkit.h +++ b/include/hw/arm/armsse.h @@ -58,8 +58,8 @@ * + named GPIO outputs mscexp_ns[0..15] */ -#ifndef IOTKIT_H -#define IOTKIT_H +#ifndef ARMSSE_H +#define ARMSSE_H #include "hw/sysbus.h" #include "hw/arm/armv7m.h" diff --git a/hw/arm/iotkit.c b/hw/arm/armsse.c similarity index 99% rename from hw/arm/iotkit.c rename to hw/arm/armsse.c index 7ff14fd5aef..8554be14128 100644 --- a/hw/arm/iotkit.c +++ b/hw/arm/armsse.c @@ -15,7 +15,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" -#include "hw/arm/iotkit.h" +#include "hw/arm/armsse.h" #include "hw/arm/arm.h" struct ARMSSEInfo { diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 5824335b4fb..3859f17d98b 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -46,7 +46,7 @@ #include "hw/misc/mps2-fpgaio.h" #include "hw/misc/tz-mpc.h" #include "hw/misc/tz-msc.h" -#include "hw/arm/iotkit.h" +#include "hw/arm/armsse.h" #include "hw/dma/pl080.h" #include "hw/ssi/pl022.h" #include "hw/devices.h" diff --git a/MAINTAINERS b/MAINTAINERS index 234e5c413bd..c2ad4e52c9d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -623,8 +623,8 @@ F: hw/arm/mps2.c F: hw/arm/mps2-tz.c F: hw/misc/mps2-*.c F: include/hw/misc/mps2-*.h -F: hw/arm/iotkit.c -F: include/hw/arm/iotkit.h +F: hw/arm/armsse.c +F: include/hw/arm/armsse.h F: hw/misc/iotkit-secctl.c F: include/hw/misc/iotkit-secctl.h F: hw/misc/iotkit-sysctl.c diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2420491aacd..3f200157879 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -114,7 +114,7 @@ CONFIG_MPS2_SCC=y CONFIG_TZ_MPC=y CONFIG_TZ_MSC=y CONFIG_TZ_PPC=y -CONFIG_IOTKIT=y +CONFIG_ARMSSE=y CONFIG_IOTKIT_SECCTL=y CONFIG_IOTKIT_SYSCTL=y CONFIG_IOTKIT_SYSINFO=y