diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 175c9f70aa..89be0b3bd7 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -11,6 +11,7 @@ config ARCH_UNIPHIER_64BIT
 	bool
 	select ARM64
 	select SPL_SEPARATE_BSS
+	select ARMV8_MULTIENTRY
 
 choice
         prompt "UniPhier SoC select"
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 68f6c9f239..77057d0097 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -99,7 +99,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		1
 
 #ifdef CONFIG_ARM64
-#define CONFIG_ARMV8_MULTIENTRY
 #define CPU_RELEASE_ADDR			0x80000000
 #define COUNTER_FREQUENCY			50000000
 #define CONFIG_GICV3