From 18c11986674ae917aad2465ef88cbb2c4e92b170 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 17 Jun 2016 19:24:28 +0900
Subject: [PATCH] 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>
---
arch/arm/mach-uniphier/Kconfig | 1 +
include/configs/uniphier.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 175c9f70aaa..89be0b3bd74 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 68f6c9f2395..77057d00976 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
--
GitLab