Start the backing out the 32/64-bit split by moving arm64-only features
up a level into the main arch directory.
Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx>
---
Makefile | 6 +++---
arm/{aarch64 => }/arm-cpu.c | 0
arm/{aarch64 => }/pmu.c | 0
arm/{aarch64 => }/pvtime.c | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename arm/{aarch64 => }/arm-cpu.c (100%)
rename arm/{aarch64 => }/pmu.c (100%)
rename arm/{aarch64 => }/pvtime.c (100%)
diff --git a/Makefile b/Makefile
index 462659b..cf50cf7 100644
--- a/Makefile
+++ b/Makefile
@@ -178,11 +178,11 @@ ifeq ($(ARCH), arm64)
OBJS += arm/pci.o
OBJS += arm/timer.o
OBJS += hw/serial.o
- OBJS += arm/aarch64/arm-cpu.o
+ OBJS += arm/arm-cpu.o
OBJS += arm/aarch64/kvm-cpu.o
OBJS += arm/aarch64/kvm.o
- OBJS += arm/aarch64/pvtime.o
- OBJS += arm/aarch64/pmu.o
+ OBJS += arm/pvtime.o
+ OBJS += arm/pmu.o
ARCH_INCLUDE := arm/include
ARCH_INCLUDE += -Iarm/aarch64/include
diff --git a/arm/aarch64/arm-cpu.c b/arm/arm-cpu.c
similarity index 100%
rename from arm/aarch64/arm-cpu.c
rename to arm/arm-cpu.c
diff --git a/arm/aarch64/pmu.c b/arm/pmu.c
similarity index 100%
rename from arm/aarch64/pmu.c
rename to arm/pmu.c
diff --git a/arm/aarch64/pvtime.c b/arm/pvtime.c
similarity index 100%
rename from arm/aarch64/pvtime.c
rename to arm/pvtime.c
--
2.39.5
