diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 30fd2ed93978..e6aca688be20 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -21,6 +21,10 @@ ifeq ($(CONFIG_MACH_MESON8B),y)
 include $(srctree)/arch/arm/mach-meson/Makefile.boot
 endif
 
+ifeq ($(CONFIG_ARM64_A32),y)
+include $(srctree)/arch/arm/mach-meson/Makefile.boot
+endif
+
 include $(srctree)/arch/arm/boot/dts/Makefile
 
 # Note: the following conditions must always be true:
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 44a995ce3cc4..cda1cc1ee69e 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -12,17 +12,17 @@ if ARCH_MESON
 
 config MACH_MESON6
 	bool "Amlogic Meson6 (8726MX) SoCs support"
-	default ARCH_MESON
+	default !ARM64_A32
 	select MESON6_TIMER
 
 config MACH_MESON8
 	bool "Amlogic Meson8 SoCs support"
-	default ARCH_MESON
+	default !ARM64_A32
 	select MESON6_TIMER
 
 config MACH_MESON8B
 	bool "Amlogic Meson8b SoCs support"
-	default ARCH_MESON
+	default !ARM64_A32
 
 config ARM64_A32
 	tristate "ARMV8 Run in A32"