diff mbox

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

Message ID 1415241567-15855-3-git-send-email-yamada.m@jp.panasonic.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada Nov. 6, 2014, 2:39 a.m. UTC 
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>
---

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

Comments

Tom Rini Nov. 13, 2014, 3:33 p.m. UTC | #1 
On Thu, Nov 06, 2014 at 11:39:27AM +0900, Masahiro Yamada wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

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