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 49b00da..a77e6f9 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 2352e66..4692851 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 6c7cd24..0294926 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 79a60c2..54176e8 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 d935aff..8331327 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 17073e8..39027c9 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 07aa024..2c0b88c 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 10dffed..25b170a 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 45bd600..c8f2de2 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 a24fe91..08cde83 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 bda785d..7f24f41 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 c55c109..6597870 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 2d3cbec..050cc4c 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 5eb2923..10b8786 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 af71295..755d289 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 cc0092c..ab5cd0e 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 7c6aae9..7f40888 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 8abdea0..be88924 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 97d966f..3fba80d 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 d512988..101d2b5 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 15787e6..e204c76 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 a1c383e..467580c 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"