This helps understanding which source modules are shared between arm and
the upcoming arm64 architecture. If leaving them in arch/arm, the risk
is that changes to arm miss the interdependency with arm64.

We may want to do the same for common asm headers in the future.

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
 hypervisor/arch/{arm => arm-common}/dbg-write-pl011.c |  0
 hypervisor/arch/{arm => arm-common}/dbg-write.c       |  0
 hypervisor/arch/{arm => arm-common}/gic-common.c      |  0
 hypervisor/arch/{arm => arm-common}/gic-v2.c          |  0
 hypervisor/arch/{arm => arm-common}/irqchip.c         |  0
 hypervisor/arch/{arm => arm-common}/lib.c             |  0
 hypervisor/arch/{arm => arm-common}/mmu_cell.c        |  0
 hypervisor/arch/{arm => arm-common}/paging.c          |  0
 hypervisor/arch/{arm => arm-common}/psci.c            |  0
 hypervisor/arch/arm/Makefile                          | 16 +++++++++-------
 10 files changed, 9 insertions(+), 7 deletions(-)
 rename hypervisor/arch/{arm => arm-common}/dbg-write-pl011.c (100%)
 rename hypervisor/arch/{arm => arm-common}/dbg-write.c (100%)
 rename hypervisor/arch/{arm => arm-common}/gic-common.c (100%)
 rename hypervisor/arch/{arm => arm-common}/gic-v2.c (100%)
 rename hypervisor/arch/{arm => arm-common}/irqchip.c (100%)
 rename hypervisor/arch/{arm => arm-common}/lib.c (100%)
 rename hypervisor/arch/{arm => arm-common}/mmu_cell.c (100%)
 rename hypervisor/arch/{arm => arm-common}/paging.c (100%)
 rename hypervisor/arch/{arm => arm-common}/psci.c (100%)

diff --git a/hypervisor/arch/arm/dbg-write-pl011.c 
b/hypervisor/arch/arm-common/dbg-write-pl011.c
similarity index 100%
rename from hypervisor/arch/arm/dbg-write-pl011.c
rename to hypervisor/arch/arm-common/dbg-write-pl011.c
diff --git a/hypervisor/arch/arm/dbg-write.c 
b/hypervisor/arch/arm-common/dbg-write.c
similarity index 100%
rename from hypervisor/arch/arm/dbg-write.c
rename to hypervisor/arch/arm-common/dbg-write.c
diff --git a/hypervisor/arch/arm/gic-common.c 
b/hypervisor/arch/arm-common/gic-common.c
similarity index 100%
rename from hypervisor/arch/arm/gic-common.c
rename to hypervisor/arch/arm-common/gic-common.c
diff --git a/hypervisor/arch/arm/gic-v2.c b/hypervisor/arch/arm-common/gic-v2.c
similarity index 100%
rename from hypervisor/arch/arm/gic-v2.c
rename to hypervisor/arch/arm-common/gic-v2.c
diff --git a/hypervisor/arch/arm/irqchip.c 
b/hypervisor/arch/arm-common/irqchip.c
similarity index 100%
rename from hypervisor/arch/arm/irqchip.c
rename to hypervisor/arch/arm-common/irqchip.c
diff --git a/hypervisor/arch/arm/lib.c b/hypervisor/arch/arm-common/lib.c
similarity index 100%
rename from hypervisor/arch/arm/lib.c
rename to hypervisor/arch/arm-common/lib.c
diff --git a/hypervisor/arch/arm/mmu_cell.c 
b/hypervisor/arch/arm-common/mmu_cell.c
similarity index 100%
rename from hypervisor/arch/arm/mmu_cell.c
rename to hypervisor/arch/arm-common/mmu_cell.c
diff --git a/hypervisor/arch/arm/paging.c b/hypervisor/arch/arm-common/paging.c
similarity index 100%
rename from hypervisor/arch/arm/paging.c
rename to hypervisor/arch/arm-common/paging.c
diff --git a/hypervisor/arch/arm/psci.c b/hypervisor/arch/arm-common/psci.c
similarity index 100%
rename from hypervisor/arch/arm/psci.c
rename to hypervisor/arch/arm-common/psci.c
diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile
index 30986b9..b844fb2 100644
--- a/hypervisor/arch/arm/Makefile
+++ b/hypervisor/arch/arm/Makefile
@@ -16,14 +16,16 @@ KBUILD_AFLAGS := $(subst -include 
asm/unified.h,,$(KBUILD_AFLAGS))
 
 always := built-in.o
 
-obj-y := entry.o dbg-write.o exception.o setup.o control.o lib.o
-obj-y += traps.o mmio.o
-obj-y += paging.o mmu_hyp.o mmu_cell.o caches.o
-obj-y += psci.o smp.o
-obj-y += irqchip.o gic-common.o
-obj-$(CONFIG_ARM_GIC_V2) += gic-v2.o
+COMMON := ../arm-common
+
+obj-y := entry.o exception.o setup.o control.o traps.o mmio.o
+obj-y += mmu_hyp.o caches.o smp.o
+obj-y += $(COMMON)/dbg-write.o $(COMMON)/lib.o $(COMMON)/psci.o
+obj-y += $(COMMON)/paging.o $(COMMON)/mmu_cell.o
+obj-y += $(COMMON)/irqchip.o $(COMMON)/gic-common.o
+obj-$(CONFIG_ARM_GIC_V2) += $(COMMON)/gic-v2.o
 obj-$(CONFIG_ARM_GIC_V3) += gic-v3.o
-obj-$(CONFIG_SERIAL_AMBA_PL011) += dbg-write-pl011.o
+obj-$(CONFIG_SERIAL_AMBA_PL011) += $(COMMON)/dbg-write-pl011.o
 obj-$(CONFIG_SERIAL_8250_DW) += uart-8250-dw.o
 obj-$(CONFIG_SERIAL_TEGRA) += uart-tegra.o
 obj-$(CONFIG_MACH_VEXPRESS) += smp-vexpress.o
-- 
2.1.4

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to