mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/iotkit: Rename files to hw/arm/armsse.[ch]

Browse Source 
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 <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190121185118.18550-8-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-02-01 14:55:42 +00:00
parent 13628891b3
commit 6eee5d241a
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -623,8 +623,8 @@ F: hw/arm/mps2.c
F: hw/arm/mps2-tz.c F: hw/arm/mps2-tz.c
F: hw/misc/mps2-*.c F: hw/misc/mps2-*.c
F: include/hw/misc/mps2-*.h F: include/hw/misc/mps2-*.h
F: hw/arm/iotkit.c F: hw/arm/armsse.c
F: include/hw/arm/iotkit.h F: include/hw/arm/armsse.h
F: hw/misc/iotkit-secctl.c F: hw/misc/iotkit-secctl.c
F: include/hw/misc/iotkit-secctl.h F: include/hw/misc/iotkit-secctl.h
F: hw/misc/iotkit-sysctl.c F: hw/misc/iotkit-sysctl.c

2
default-configs/arm-softmmu.mak
View File

@ -114,7 +114,7 @@ CONFIG_MPS2_SCC=y
CONFIG_TZ_MPC=y CONFIG_TZ_MPC=y
CONFIG_TZ_MSC=y CONFIG_TZ_MSC=y
CONFIG_TZ_PPC=y CONFIG_TZ_PPC=y
CONFIG_IOTKIT=y CONFIG_ARMSSE=y
CONFIG_IOTKIT_SECCTL=y CONFIG_IOTKIT_SECCTL=y
CONFIG_IOTKIT_SYSCTL=y CONFIG_IOTKIT_SYSCTL=y
CONFIG_IOTKIT_SYSINFO=y CONFIG_IOTKIT_SYSINFO=y

2
hw/arm/Makefile.objs
View File

@ -34,7 +34,7 @@ obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o
obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MPS2) += mps2.o
obj-$(CONFIG_MPS2) += mps2-tz.o obj-$(CONFIG_MPS2) += mps2-tz.o
obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.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_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o

2
hw/arm/iotkit.c → hw/arm/armsse.c
View File

@ -15,7 +15,7 @@
#include "trace.h" #include "trace.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "hw/arm/iotkit.h" #include "hw/arm/armsse.h"
#include "hw/arm/arm.h" #include "hw/arm/arm.h"
struct ARMSSEInfo { struct ARMSSEInfo {

2
hw/arm/mps2-tz.c
View File

@ -46,7 +46,7 @@
#include "hw/misc/mps2-fpgaio.h" #include "hw/misc/mps2-fpgaio.h"
#include "hw/misc/tz-mpc.h" #include "hw/misc/tz-mpc.h"
#include "hw/misc/tz-msc.h" #include "hw/misc/tz-msc.h"
#include "hw/arm/iotkit.h" #include "hw/arm/armsse.h"
#include "hw/dma/pl080.h" #include "hw/dma/pl080.h"
#include "hw/ssi/pl022.h" #include "hw/ssi/pl022.h"
#include "hw/devices.h" #include "hw/devices.h"

4
include/hw/arm/iotkit.h → include/hw/arm/armsse.h
View File

@ -58,8 +58,8 @@
* + named GPIO outputs mscexp_ns[0..15] * + named GPIO outputs mscexp_ns[0..15]
*/ */
#ifndef IOTKIT_H #ifndef ARMSSE_H
#define IOTKIT_H #define ARMSSE_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/arm/armv7m.h" #include "hw/arm/armv7m.h"