jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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

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

Peter Maydell 6eee5d24 13628891

+8 -8
+2 -2
MAINTAINERS
··· 623 623 F: hw/arm/mps2-tz.c 624 624 F: hw/misc/mps2-*.c 625 625 F: include/hw/misc/mps2-*.h 626 - F: hw/arm/iotkit.c 627 - F: include/hw/arm/iotkit.h 626 + F: hw/arm/armsse.c 627 + F: include/hw/arm/armsse.h 628 628 F: hw/misc/iotkit-secctl.c 629 629 F: include/hw/misc/iotkit-secctl.h 630 630 F: hw/misc/iotkit-sysctl.c
+1 -1
default-configs/arm-softmmu.mak
··· 114 114 CONFIG_TZ_MPC=y 115 115 CONFIG_TZ_MSC=y 116 116 CONFIG_TZ_PPC=y 117 - CONFIG_IOTKIT=y 117 + CONFIG_ARMSSE=y 118 118 CONFIG_IOTKIT_SECCTL=y 119 119 CONFIG_IOTKIT_SYSCTL=y 120 120 CONFIG_IOTKIT_SYSINFO=y
+1 -1
hw/arm/Makefile.objs
··· 34 34 obj-$(CONFIG_MPS2) += mps2.o 35 35 obj-$(CONFIG_MPS2) += mps2-tz.o 36 36 obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o 37 - obj-$(CONFIG_IOTKIT) += iotkit.o 37 + obj-$(CONFIG_ARMSSE) += armsse.o 38 38 obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o 39 39 obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o 40 40 obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o
+1 -1
hw/arm/iotkit.c hw/arm/armsse.c
··· 15 15 #include "trace.h" 16 16 #include "hw/sysbus.h" 17 17 #include "hw/registerfields.h" 18 - #include "hw/arm/iotkit.h" 18 + #include "hw/arm/armsse.h" 19 19 #include "hw/arm/arm.h" 20 20 21 21 struct ARMSSEInfo {
+1 -1
hw/arm/mps2-tz.c
··· 46 46 #include "hw/misc/mps2-fpgaio.h" 47 47 #include "hw/misc/tz-mpc.h" 48 48 #include "hw/misc/tz-msc.h" 49 - #include "hw/arm/iotkit.h" 49 + #include "hw/arm/armsse.h" 50 50 #include "hw/dma/pl080.h" 51 51 #include "hw/ssi/pl022.h" 52 52 #include "hw/devices.h"
+2 -2
include/hw/arm/iotkit.h include/hw/arm/armsse.h
··· 58 58 * + named GPIO outputs mscexp_ns[0..15] 59 59 */ 60 60 61 - #ifndef IOTKIT_H 62 - #define IOTKIT_H 61 + #ifndef ARMSSE_H 62 + #define ARMSSE_H 63 63 64 64 #include "hw/sysbus.h" 65 65 #include "hw/arm/armv7m.h"