ARM: uniphier: move CONFIG_ARMV8_MULTIENTRY to Kconfig

I just did not notice this option had an entry in Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 175c9f70aaa6c53ba0fc5d1fbdf531eae38f1814..89be0b3bd74eb3c1366a25c175f54b6def3e8299 100644 (file)
--- 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 68f6c9f2395015e153e943a9360e25d58099e5e8..77057d00976c63686c7b35d7c962efeb64875cf9 100644 (file)
--- 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