[U-Boot] [PATCH v2 2/2] kconfig: arm: move "armv8" define to arch/arm/Kconfig

Masahiro Yamada yamada.m at jp.panasonic.com
Thu Nov 6 03:39:27 CET 2014


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 at jp.panasonic.com>
Acked-by: Georges Savoundararadj <savoundg at gmail.com>
---

Changes in v2: None

 arch/arm/Kconfig           | 3 +--
 arch/arm/cpu/armv8/Kconfig | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 arch/arm/cpu/armv8/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d3b80ba..336f3f4 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"
@@ -779,8 +780,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 3d1655b..0000000
--- a/arch/arm/cpu/armv8/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-if ARM64
-
-config SYS_CPU
-	default "armv8"
-
-endif
-- 
1.9.1



More information about the U-Boot mailing list