sh: consolidate CONFIG_SYS_CPU defines

Now each board selects one of CONFIG_CPU_SH2, CONFIG_CPU_SH3,
CONFIG_CPU_SH4, so let's move CONFIG_SYS_CPU definition to
arch/sh/Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 49b00da8fb0a397d635621143daded08f0e06fcc..a77e6f9c07d10538f3f442df8fd1215f270a665e 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1,9 +1,6 @@
 menu "SuperH architecture"
        depends on SH
 
-config SYS_ARCH
-       default "sh"
-
 config CPU_SH2
        bool
 
@@ -110,6 +107,14 @@ config TARGET_SH7785LCR
 
 endchoice
 
+config SYS_ARCH
+       default "sh"
+
+config SYS_CPU
+       default "sh2" if CPU_SH2
+       default "sh3" if CPU_SH3
+       default "sh4" if CPU_SH4
+
 source "board/alphaproject/ap_sh4a_4a/Kconfig"
 source "board/espt/Kconfig"
 source "board/mpr2/Kconfig"

diff --git a/board/alphaproject/ap_sh4a_4a/Kconfig b/board/alphaproject/ap_sh4a_4a/Kconfig
index 2352e6680692c279ba50f4b621e94ec93ca4b59f..4692851b268fb18a453b78e066e22a5e4d6d8ce7 100644 (file)
--- a/board/alphaproject/ap_sh4a_4a/Kconfig
+++ b/board/alphaproject/ap_sh4a_4a/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_AP_SH4A_4A
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "ap_sh4a_4a"
 

diff --git a/board/espt/Kconfig b/board/espt/Kconfig
index 6c7cd241550046d09b8ce1b99f19ad33a7247fe6..0294926cf5b667a33814420113794574795bd08e 100644 (file)
--- a/board/espt/Kconfig
+++ b/board/espt/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_ESPT
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "espt"
 

diff --git a/board/mpr2/Kconfig b/board/mpr2/Kconfig
index 79a60c2f2d965b5d70270b18850943197df2ec1a..54176e8f6f2e41f79f415b4ade5d42cd9e20a173 100644 (file)
--- a/board/mpr2/Kconfig
+++ b/board/mpr2/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_MPR2
 
-config SYS_CPU
-       default "sh3"
-
 config SYS_BOARD
        default "mpr2"
 

diff --git a/board/ms7720se/Kconfig b/board/ms7720se/Kconfig
index d935affdd9dd0e73e715c7ab1bf9e764525e00ba..83313279b3b072d769a1fa46dacda7723d93ec11 100644 (file)
--- a/board/ms7720se/Kconfig
+++ b/board/ms7720se/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_MS7720SE
 
-config SYS_CPU
-       default "sh3"
-
 config SYS_BOARD
        default "ms7720se"
 

diff --git a/board/ms7722se/Kconfig b/board/ms7722se/Kconfig
index 17073e81e911f9dcabf9b2e9a09790e26986df43..39027c9864fdabc71609b60b16807d6962cb1bb5 100644 (file)
--- a/board/ms7722se/Kconfig
+++ b/board/ms7722se/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_MS7722SE
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "ms7722se"
 

diff --git a/board/ms7750se/Kconfig b/board/ms7750se/Kconfig
index 07aa0247b7ed0f4d758b505f21e75866ba413624..2c0b88c77532d586d78caacee1a094eca9b63f64 100644 (file)
--- a/board/ms7750se/Kconfig
+++ b/board/ms7750se/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_MS7750SE
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "ms7750se"
 

diff --git a/board/renesas/MigoR/Kconfig b/board/renesas/MigoR/Kconfig
index 10dffeda9f65c279a0ee05443b48c58096d0e91e..25b170ac07121eb6336e83301931694f5877ab73 100644 (file)
--- a/board/renesas/MigoR/Kconfig
+++ b/board/renesas/MigoR/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_MIGOR
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "MigoR"
 

diff --git a/board/renesas/ap325rxa/Kconfig b/board/renesas/ap325rxa/Kconfig
index 45bd6003bd91124ab933ab2a2c627f2f32f5b3bb..c8f2de29592b6d4aae99d839a4c8f766e8b070cc 100644 (file)
--- a/board/renesas/ap325rxa/Kconfig
+++ b/board/renesas/ap325rxa/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_AP325RXA
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "ap325rxa"
 

diff --git a/board/renesas/ecovec/Kconfig b/board/renesas/ecovec/Kconfig
index a24fe911e0897b0ba94f1d8c46a3a06c50b480f1..08cde83356295e74e16fe092576e3f264c530f86 100644 (file)
--- a/board/renesas/ecovec/Kconfig
+++ b/board/renesas/ecovec/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_ECOVEC
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "ecovec"
 

diff --git a/board/renesas/r0p7734/Kconfig b/board/renesas/r0p7734/Kconfig
index bda785dc97c97fd2a45634511d98caaa1823cd3b..7f24f41b8f8f5864d1b763dc6fa59b3f7c1b4b7e 100644 (file)
--- a/board/renesas/r0p7734/Kconfig
+++ b/board/renesas/r0p7734/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_R0P7734
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "r0p7734"
 

diff --git a/board/renesas/r2dplus/Kconfig b/board/renesas/r2dplus/Kconfig
index c55c109f6b02dbcff367456fee4d59b6194028c6..6597870a86e6d4457ec9a4a0abbab8c595975700 100644 (file)
--- a/board/renesas/r2dplus/Kconfig
+++ b/board/renesas/r2dplus/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_R2DPLUS
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "r2dplus"
 

diff --git a/board/renesas/r7780mp/Kconfig b/board/renesas/r7780mp/Kconfig
index 2d3cbeca5b89f7b594c3752ff141e80ce7172820..050cc4cc0f6dd9d586db388453c97104502b2a4d 100644 (file)
--- a/board/renesas/r7780mp/Kconfig
+++ b/board/renesas/r7780mp/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_R7780MP
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "r7780mp"
 

diff --git a/board/renesas/rsk7203/Kconfig b/board/renesas/rsk7203/Kconfig
index 5eb2923fb9aaf23adc0677ea666740ec6bd5a04a..10b8786411f9b5729c5ffcb2be207c1241052138 100644 (file)
--- a/board/renesas/rsk7203/Kconfig
+++ b/board/renesas/rsk7203/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_RSK7203
 
-config SYS_CPU
-       default "sh2"
-
 config SYS_BOARD
        default "rsk7203"
 

diff --git a/board/renesas/rsk7264/Kconfig b/board/renesas/rsk7264/Kconfig
index af71295a259a71d3767ab6f4dfcea0b055681583..755d2896fb1b846d70b760c079b42ef7ba9ef6a6 100644 (file)
--- a/board/renesas/rsk7264/Kconfig
+++ b/board/renesas/rsk7264/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_RSK7264
 
-config SYS_CPU
-       default "sh2"
-
 config SYS_BOARD
        default "rsk7264"
 

diff --git a/board/renesas/rsk7269/Kconfig b/board/renesas/rsk7269/Kconfig
index cc0092c2fbbc31e0af7b08e273d5fdbfe15d371d..ab5cd0e38fecd85df880008d39eed587a1a07999 100644 (file)
--- a/board/renesas/rsk7269/Kconfig
+++ b/board/renesas/rsk7269/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_RSK7269
 
-config SYS_CPU
-       default "sh2"
-
 config SYS_BOARD
        default "rsk7269"
 

diff --git a/board/renesas/sh7752evb/Kconfig b/board/renesas/sh7752evb/Kconfig
index 7c6aae94bf40a4fc290935bf1e4a45f60d8202b2..7f40888336eb154436053b2cfa98e826d7929089 100644 (file)
--- a/board/renesas/sh7752evb/Kconfig
+++ b/board/renesas/sh7752evb/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_SH7752EVB
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "sh7752evb"
 

diff --git a/board/renesas/sh7753evb/Kconfig b/board/renesas/sh7753evb/Kconfig
index 8abdea0b13a59c74bfc77308d89577fe9c9754ff..be889248a8e78378199382e2b28a5883b1bab92c 100644 (file)
--- a/board/renesas/sh7753evb/Kconfig
+++ b/board/renesas/sh7753evb/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_SH7753EVB
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "sh7753evb"
 

diff --git a/board/renesas/sh7757lcr/Kconfig b/board/renesas/sh7757lcr/Kconfig
index 97d966feb2af253fcc49fcf253042def518ae3b5..3fba80ddcab22a0d1a13f2ad45b396b06ee46d5e 100644 (file)
--- a/board/renesas/sh7757lcr/Kconfig
+++ b/board/renesas/sh7757lcr/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_SH7757LCR
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "sh7757lcr"
 

diff --git a/board/renesas/sh7763rdp/Kconfig b/board/renesas/sh7763rdp/Kconfig
index d5129881387fbe542a60117c15f84b6218b3599e..101d2b5a32e491950fe7dfc58b4dbb1e74f24234 100644 (file)
--- a/board/renesas/sh7763rdp/Kconfig
+++ b/board/renesas/sh7763rdp/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_SH7763RDP
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "sh7763rdp"
 

diff --git a/board/renesas/sh7785lcr/Kconfig b/board/renesas/sh7785lcr/Kconfig
index 15787e645e4a2375f23e7aaa02cb25ad286b3898..e204c76ef56351c5f0b2e080ef659335c88e9486 100644 (file)
--- a/board/renesas/sh7785lcr/Kconfig
+++ b/board/renesas/sh7785lcr/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_SH7785LCR
 
-config SYS_CPU
-       default "sh4"
-
 config SYS_BOARD
        default "sh7785lcr"
 

diff --git a/board/shmin/Kconfig b/board/shmin/Kconfig
index a1c383e1b2c4cb6b6d8b9375db2a9894aa23805f..467580c67b965f99fb85e33f9013fe08168c6f2b 100644 (file)
--- a/board/shmin/Kconfig
+++ b/board/shmin/Kconfig
@@ -1,8 +1,5 @@
 if TARGET_SHMIN
 
-config SYS_CPU
-       default "sh3"
-
 config SYS_BOARD
        default "shmin"