sh: Move SH_32BIT to Kconfig

This moves SH_32BIT to Kconfig, and removes SH_32BIT from config files. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years ago · 570dd7f441
parent f97eeba445
commit 570dd7f441
8 changed files with 13 additions and 4 deletions
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@ -18,6 +18,15 @@ config CPU_SH4A
 	bool
 	select CPU_SH4

+config SH_32BIT
+	bool "32bit mode"
+	depends on CPU_SH4A
+	default n
+	help
+	  SH4A has 2 physical memory maps. This use 32bit mode.
+	  And this is board specific. Please check your board if you
+	  want to use this.
+
 choice
 	prompt "Target select"

--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@ -1,2 +1,3 @@
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7752EVB=y
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@ -1,2 +1,3 @@
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7753EVB=y
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@ -1,2 +1,3 @@
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7757LCR=y
--- a/configs/sh7785lcr_32bit_defconfig
+++ b/configs/sh7785lcr_32bit_defconfig
@ -1,3 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SH_32BIT=1"
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7785LCR=y
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@ -10,7 +10,6 @@
 #define __SH7752EVB_H

 #undef DEBUG
-#define CONFIG_SH_32BIT		1
 #define CONFIG_CPU_SH7752	1
 #define CONFIG_SH7752EVB	1

--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@ -10,7 +10,6 @@
 #define __SH7753EVB_H

 #undef DEBUG
-#define CONFIG_SH_32BIT		1
 #define CONFIG_CPU_SH7753	1
 #define CONFIG_SH7753EVB	1

--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@ -10,7 +10,6 @@
 #define __SH7757LCR_H

 #undef DEBUG
-#define CONFIG_SH_32BIT		1
 #define CONFIG_CPU_SH7757	1
 #define CONFIG_SH7757LCR	1
 #define CONFIG_SH7757LCR_DDR_ECC	1