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>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 685406baab137a33b875b9ff985954fe0d1ca2b8..ff8f5b5ce8d6887a11f32c5fe4d0fabd7b0fb015 100644 (file)
--- 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"
 

diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index 124154cc96237ca966ebf9e196c2889eda121720..1f7c6d02845c3f67d03f8499a2245e0d3b1aa189 100644 (file)
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -1,2 +1,3 @@
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7752EVB=y

diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index 9ff41218b9bcef5ad18dcfaae8943d1d6c724ed0..35809e9530d52e62ecc06b21ccc20430e9d3f5e0 100644 (file)
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -1,2 +1,3 @@
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7753EVB=y

diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index 3066d97f84f6449f9b898e7c64aa6d39c65b96c0..ffcf961bb5532b7a95186fc657d193269a9b6bbd 100644 (file)
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -1,2 +1,3 @@
 CONFIG_SH=y
+CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7757LCR=y

diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig
index 7cf93b47edf1a93f0c90310c978a716b08411f12..31b84ff35276c6c335f4b3e26ca35cca58d122e8 100644 (file)
--- 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

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index f06abbca0c210deec791eb36701a074f25f4f703..2d509a9b9c3b69f692c9abaf3a4bb80cb5a33543 100644 (file)
--- 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
 

diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index e400db08ad9b4667d3c34c8c613081b6b9cd23f7..c31dd7a17472d6a5d6100656bf8eec422625456c 100644 (file)
--- 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
 

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 08bff1da3fa227b012eca0b96a1ecf685d7afa15..36afd5f70a5f947ac8f8f0f1868dc7199c23dcb2 100644 (file)
--- 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