[PATCH 06/22] ARM: mmu: provide zero page control in PBL

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

There's no reason to preclude zero page control in PBL if MMU is setup
and given that we want to add code to mmu-common.c that we want to use
in PBL, let's remove this artificial limitation.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/cpu/Makefile | 2 +-
 include/zero_page.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index 955059279670..467ef17bfd55 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -4,7 +4,7 @@ obj-pbl-y += cpu.o
 
 obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions_$(S64_32).o interrupts_$(S64_32).o
 pbl-$(CONFIG_ARM_EXCEPTIONS_PBL) += exceptions_$(S64_32).o interrupts_$(S64_32).o
-obj-$(CONFIG_MMU) += mmu-common.o
+obj-pbl-$(CONFIG_MMU) += mmu-common.o
 obj-pbl-$(CONFIG_MMU) += mmu_$(S64_32).o
 obj-$(CONFIG_MMU) += dma_$(S64_32).o
 obj-pbl-y += lowlevel_$(S64_32).o
diff --git a/include/zero_page.h b/include/zero_page.h
index 067f39a7ee96..8dd66a1efb9b 100644
--- a/include/zero_page.h
+++ b/include/zero_page.h
@@ -4,7 +4,7 @@
 
 #include <common.h>
 
-#if defined CONFIG_ARCH_HAS_ZERO_PAGE && defined CONFIG_MMU && IN_PROPER
+#if defined CONFIG_ARCH_HAS_ZERO_PAGE && defined CONFIG_MMU
 
 /*
  * zero_page_faulting - fault when accessing the zero page
-- 
2.39.5