Similar to commit (d736b6eb451b, "xen/arm: mpu: Define Xen start address for
MPU systems"), one needs to add a build assertion to ensure that the page size
is 4KB on arm32 based systems as well.
The existing build assertion is moved under "xen/arch/arm/mpu" as it applies
for both arm64 and arm32 based systems.
Signed-off-by: Ayan Kumar Halder <ayan.kumar.hal...@amd.com>
---
Changes from :-
v1 - 1. Extracted the changes to a common file.
(I have dropped Luca's R-b as there were code changes.)
xen/arch/arm/Makefile | 1 +
xen/arch/arm/arm64/mpu/Makefile | 1 -
xen/arch/arm/mpu/Makefile | 1 +
xen/arch/arm/{arm64 => }/mpu/mm.c | 0
4 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 xen/arch/arm/mpu/Makefile
rename xen/arch/arm/{arm64 => }/mpu/mm.c (100%)
diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 43ab5e8f25..fb0948f067 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -1,6 +1,7 @@
obj-$(CONFIG_ARM_32) += arm32/
obj-$(CONFIG_ARM_64) += arm64/
obj-$(CONFIG_MMU) += mmu/
+obj-$(CONFIG_MPU) += mpu/
obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_HAS_PCI) += pci/
ifneq ($(CONFIG_NO_PLAT),y)
diff --git a/xen/arch/arm/arm64/mpu/Makefile b/xen/arch/arm/arm64/mpu/Makefile
index a8a750a3d0..3340058c08 100644
--- a/xen/arch/arm/arm64/mpu/Makefile
+++ b/xen/arch/arm/arm64/mpu/Makefile
@@ -1,2 +1 @@
obj-y += head.o
-obj-y += mm.o
diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile
new file mode 100644
index 0000000000..b18cec4836
--- /dev/null
+++ b/xen/arch/arm/mpu/Makefile
@@ -0,0 +1 @@
+obj-y += mm.o
diff --git a/xen/arch/arm/arm64/mpu/mm.c b/xen/arch/arm/mpu/mm.c
similarity index 100%
rename from xen/arch/arm/arm64/mpu/mm.c
rename to xen/arch/arm/mpu/mm.c
--
2.25.1
