Ver código fonte

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>
Masahiro Yamada 9 anos atrás
pai
commit
887363b5f0

+ 8 - 3
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"

+ 0 - 3
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"
 

+ 0 - 3
board/espt/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_ESPT
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "espt"
 

+ 0 - 3
board/mpr2/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_MPR2
 
-config SYS_CPU
-	default "sh3"
-
 config SYS_BOARD
 	default "mpr2"
 

+ 0 - 3
board/ms7720se/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_MS7720SE
 
-config SYS_CPU
-	default "sh3"
-
 config SYS_BOARD
 	default "ms7720se"
 

+ 0 - 3
board/ms7722se/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_MS7722SE
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "ms7722se"
 

+ 0 - 3
board/ms7750se/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_MS7750SE
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "ms7750se"
 

+ 0 - 3
board/renesas/MigoR/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_MIGOR
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "MigoR"
 

+ 0 - 3
board/renesas/ap325rxa/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_AP325RXA
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "ap325rxa"
 

+ 0 - 3
board/renesas/ecovec/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_ECOVEC
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "ecovec"
 

+ 0 - 3
board/renesas/r0p7734/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_R0P7734
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "r0p7734"
 

+ 0 - 3
board/renesas/r2dplus/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_R2DPLUS
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "r2dplus"
 

+ 0 - 3
board/renesas/r7780mp/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_R7780MP
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "r7780mp"
 

+ 0 - 3
board/renesas/rsk7203/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_RSK7203
 
-config SYS_CPU
-	default "sh2"
-
 config SYS_BOARD
 	default "rsk7203"
 

+ 0 - 3
board/renesas/rsk7264/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_RSK7264
 
-config SYS_CPU
-	default "sh2"
-
 config SYS_BOARD
 	default "rsk7264"
 

+ 0 - 3
board/renesas/rsk7269/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_RSK7269
 
-config SYS_CPU
-	default "sh2"
-
 config SYS_BOARD
 	default "rsk7269"
 

+ 0 - 3
board/renesas/sh7752evb/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_SH7752EVB
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "sh7752evb"
 

+ 0 - 3
board/renesas/sh7753evb/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_SH7753EVB
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "sh7753evb"
 

+ 0 - 3
board/renesas/sh7757lcr/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_SH7757LCR
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "sh7757lcr"
 

+ 0 - 3
board/renesas/sh7763rdp/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_SH7763RDP
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "sh7763rdp"
 

+ 0 - 3
board/renesas/sh7785lcr/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_SH7785LCR
 
-config SYS_CPU
-	default "sh4"
-
 config SYS_BOARD
 	default "sh7785lcr"
 

+ 0 - 3
board/shmin/Kconfig

@@ -1,8 +1,5 @@
 if TARGET_SHMIN
 
-config SYS_CPU
-	default "sh3"
-
 config SYS_BOARD
 	default "shmin"