From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Thu, 6 Nov 2014 02:39:27 +0000 (+0900)
Subject: kconfig: arm: move "armv8" define to arch/arm/Kconfig
X-Git-Tag: v2025.01-rc5-pxa1908~14317
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=01541eeccdf74ee68f9a3014b6cdc26395be4dc0;p=u-boot.git
kconfig: arm: move "armv8" define to arch/arm/Kconfig
Commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs)
collected the default values of CONFIG_SYS_CPU into arch/arm/Kconfig.
This commit moves "armv8" to there for consistency.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Georges Savoundararadj <savoundg@gmail.com>
---
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index da1452f0ab..7e26744582 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -49,6 +49,7 @@ config SYS_CPU
default "armv7" if CPU_V7
default "pxa" if CPU_PXA
default "sa1100" if CPU_SA1100
+ default "armv8" if ARM64
choice
prompt "Target select"
@@ -778,8 +779,6 @@ config ARCH_UNIPHIER
endchoice
-source "arch/arm/cpu/armv8/Kconfig"
-
source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
source "arch/arm/cpu/armv7/exynos/Kconfig"
diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
deleted file mode 100644
index 3d1655bd5c..0000000000
--- a/arch/arm/cpu/armv8/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-if ARM64
-
-config SYS_CPU
- default "armv8"
-
-endif