From patchwork Mon Jan 21 18:51:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 156235 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6701027jaa; Mon, 21 Jan 2019 10:51:29 -0800 (PST) X-Received: by 2002:a5d:42ce:: with SMTP id t14mr29776136wrr.51.1548096688977; Mon, 21 Jan 2019 10:51:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548096688; cv=none; d=google.com; s=arc-20160816; b=0dU8R8J3eVjEDwILnzWomotLt0986fadxAFiBioxv3X3AbYAEAn9kZjLmgZPGxT5hh yd0h+vo+QwW9o8WJ94l5cYkSYEMnfQwKXsNjw1/HxYp3sv+nE9nhobGmiZeAXAq63Gnw 8uIw/VjLKCYwN/5HjT38tBNYIAxVXpTMwX+TydVn9HtAD+XdVs7gvFeQKwpH8bo9QuWb mHroUmVtR/L/d2KdYmwV0Yw9hohhtqRUUa157qKRAjcinTf/YLygEy2OFjQ4mYZOHUzQ lFPlrsYLZaf9/dIIxi6PMMa0ou3Wo77X6ajDYOPu/m9pDQ/INZqQQtbE3EyHuo/fusAI kgGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=PvO18lRzUs66YBhl5hb4KNvCqQL2PZhRg/eBt9ybWrc=; b=dVEHJOrwxNsB5rIGuolrBLy0oUT2OH28ffqSNCzN/2yrmbWOxWUzln/+AsqDupNjCz W/WS03op3MJOyvZ3TukFygjl8iElPi/noZNTxdxeJQBqSBcqdiQ/XXl/9rdcJkfsHAFM rQvZ3sU1WZTT3y+u4QPDmjWJf1FYfxD7C7xJgHONkWMrlc1KLl9jYrs6FBKQq/hRA4rt V5FezKYy44tDkFTHQQyHX3Usi3EEDKFpUPJ4IgWQyouX9YCNYzp7+md2yK2Q+57UORRL 0HeCSjFmrg9TfqnpFwzjWwfAfWB27IJQ19cIRgNHmetNhXFMaHDplpq6rRPj1/8hxWmk FFKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FS1zvB3L; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v16sor32553457wmc.26.2019.01.21.10.51.28 for (Google Transport Security); Mon, 21 Jan 2019 10:51:28 -0800 (PST) Received-SPF: pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FS1zvB3L; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PvO18lRzUs66YBhl5hb4KNvCqQL2PZhRg/eBt9ybWrc=; b=FS1zvB3Lf0kfZmeTKPrbGpQmprlmH8Jl/MPGrCkn8roIJSKQxYbQel2UPSAe3sPRTS uh/zsR4oscSRe4gbLPj55vOegvdLBZWsreGSAOZo00qqXfuFlhXk6I5THugxf9U09TJH XVxz2w7BJJWn6X6tB5DorxfMa5LBcLhhBr5Xk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PvO18lRzUs66YBhl5hb4KNvCqQL2PZhRg/eBt9ybWrc=; b=W508kKP4/ps407rogu/Dz64Kg2cT6aii++78Sg4qkPpjKix+CxaC61ZtTmflRpy8nK sWJQI9h3Tlp2RqB4wU/04W+FRLNm8lhDJ0DE49pD/CquzIMKP/vQw5op++gYgc0559A2 5sdXoUvEWA0d6d/3c+CDOhxmuT4s+AaLZp+0jw/PWkThmcxboemBSHmYPZbrUs7JrU4i Q8uNbLRewZVokaDUSkbbNbcIxZdacv1StShuqhCpIE46w7C7omrNXfaUxBwII0igEKQX saWu44Cw87cjfnXRQcsMc7GLSIDDmyNS7R7AO461BiYLFImOXhf608lSwe1NN/znUcaS 2SBA== X-Gm-Message-State: AJcUukfQXGXc8Yksf4OiDWcmbNBA+ZNtaj0H1+Q/VXHzcwLnHvXjudbf x91PhC0A+BP+pdSGdNL7UDdy0ZTYn6V8/7M5 X-Google-Smtp-Source: ALg8bN7nU2A2VdZLmMINokPEgSsc0zyVHAZA9HgyMREznblGnaibnbO28l/wA5rfzcFYnEM4PUwTHw== X-Received: by 2002:a1c:6489:: with SMTP id y131mr572455wmb.34.1548096688538; Mon, 21 Jan 2019 10:51:28 -0800 (PST) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n82sm50386660wma.42.2019.01.21.10.51.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 10:51:27 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 07/23] hw/arm/iotkit: Rename files to hw/arm/armsse.[ch] Date: Mon, 21 Jan 2019 18:51:02 +0000 Message-Id: <20190121185118.18550-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121185118.18550-1-peter.maydell@linaro.org> References: <20190121185118.18550-1-peter.maydell@linaro.org> MIME-Version: 1.0 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 --- 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson 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 af339b86db7..52222117d77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -625,8 +625,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