| Message ID | 20190121185118.18550-8-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: Implement MPS2 AN521 FPGA image | expand |
On 1/21/19 7:51 PM, Peter Maydell wrote: > Rename the files that used to be iotkit.[ch] to > armsse.[ch] to reflect the fact they new cover s/new/now/? > multiple Arm subsystems for embedded. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > 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%) > > 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 >
On 1/21/19 10:51 AM, Peter Maydell wrote: > 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> > --- > 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%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
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
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> --- 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