From 790f70c725d6a89e6a9ac78f91b025454ae75dde Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Thu, 6 Nov 2014 11:39:26 +0900
Subject: [PATCH] kconfig: arm: select CPU_V7 for some new boards

This commit adds "select CPU_V7" for some new boards that were not
covered by commit 2e07c249a67e
(kconfig: arm: introduce symbol for ARM CPUs).

Redundant "SYS_CPU" defines and "string" directives should be removed.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Georges Savoundararadj <savoundg@gmail.com>
---
 arch/arm/Kconfig                        | 3 +++
 arch/arm/cpu/armv7/tegra-common/Kconfig | 4 ----
 board/Marvell/db-mv784mp-gp/Kconfig     | 8 --------
 board/kosagi/novena/Kconfig             | 3 ---
 board/maxbcm/Kconfig                    | 7 -------
 board/ti/ks2_evm/Kconfig                | 3 ---
 6 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 79ccc06d5c..da1452f0ab 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -225,9 +225,11 @@ config KIRKWOOD
 
 config TARGET_DB_MV784MP_GP
 	bool "Support db-mv784mp-gp"
+	select CPU_V7
 
 config TARGET_MAXBCM
 	bool "Support maxbcm"
+	select CPU_V7
 
 config TARGET_DEVKIT3250
 	bool "Support devkit3250"
@@ -629,6 +631,7 @@ config TARGET_HUMMINGBOARD
 
 config TARGET_KOSAGI_NOVENA
 	bool "Support Kosagi Novena"
+	select CPU_V7
 
 config TARGET_TQMA6
 	bool "TQ Systems TQMa6 board"
diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
index 3ea6d7651c..1446452c23 100644
--- a/arch/arm/cpu/armv7/tegra-common/Kconfig
+++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
@@ -20,10 +20,6 @@ endchoice
 config USE_PRIVATE_LIBGCC
 	default y if SPL_BUILD
 
-config SYS_CPU
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 source "arch/arm/cpu/armv7/tegra20/Kconfig"
 source "arch/arm/cpu/armv7/tegra30/Kconfig"
 source "arch/arm/cpu/armv7/tegra114/Kconfig"
diff --git a/board/Marvell/db-mv784mp-gp/Kconfig b/board/Marvell/db-mv784mp-gp/Kconfig
index f94a444cf2..98aa10ade0 100644
--- a/board/Marvell/db-mv784mp-gp/Kconfig
+++ b/board/Marvell/db-mv784mp-gp/Kconfig
@@ -1,23 +1,15 @@
 if TARGET_DB_MV784MP_GP
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
-	string
 	default "db-mv784mp-gp"
 
 config SYS_VENDOR
-	string
 	default "Marvell"
 
 config SYS_SOC
-	string
 	default "armada-xp"
 
 config SYS_CONFIG_NAME
-	string
 	default "db-mv784mp-gp"
 
 endif
diff --git a/board/kosagi/novena/Kconfig b/board/kosagi/novena/Kconfig
index 4ba63999ae..94f1754a47 100644
--- a/board/kosagi/novena/Kconfig
+++ b/board/kosagi/novena/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_KOSAGI_NOVENA
 
-config SYS_CPU
-	default "armv7"
-
 config SYS_BOARD
 	default "novena"
 
diff --git a/board/maxbcm/Kconfig b/board/maxbcm/Kconfig
index d34e2abf36..d833ca0e25 100644
--- a/board/maxbcm/Kconfig
+++ b/board/maxbcm/Kconfig
@@ -1,19 +1,12 @@
 if TARGET_MAXBCM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
-	string
 	default "maxbcm"
 
 config SYS_SOC
-	string
 	default "armada-xp"
 
 config SYS_CONFIG_NAME
-	string
 	default "maxbcm"
 
 endif
diff --git a/board/ti/ks2_evm/Kconfig b/board/ti/ks2_evm/Kconfig
index 96c5f22ead..384b175e9c 100644
--- a/board/ti/ks2_evm/Kconfig
+++ b/board/ti/ks2_evm/Kconfig
@@ -27,15 +27,12 @@ endif
 if TARGET_K2L_EVM
 
 config SYS_BOARD
-	string
 	default "ks2_evm"
 
 config SYS_VENDOR
-	string
 	default "ti"
 
 config SYS_CONFIG_NAME
-	string
 	default "k2l_evm"
 
 endif
-- 
2.39.5