summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-11-06 11:39:27 +0900
committerTom Rini <trini@ti.com>2014-11-13 08:37:25 -0500
commit01541eeccdf74ee68f9a3014b6cdc26395be4dc0 (patch)
treec084379a35742779761d66a5bb0e669329c6b3c7 /arch
parent790f70c725d6a89e6a9ac78f91b025454ae75dde (diff)
downloadtalos-obmc-uboot-01541eeccdf74ee68f9a3014b6cdc26395be4dc0.tar.gz
talos-obmc-uboot-01541eeccdf74ee68f9a3014b6cdc26395be4dc0.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--arch/arm/cpu/armv8/Kconfig6
2 files changed, 1 insertions, 8 deletions
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
OpenPOWER on IntegriCloud