diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2014-11-14 03:52:47 (GMT) |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2014-11-17 04:16:20 (GMT) |
| commit | 570dd7f441c2d2d2e83a9345608801c92e7d2c6f (patch) | |
| tree | 611f4278240d5ac2932e3b04b7b9034b88d9d7c9 | |
| parent | f97eeba44571fa3d85bdbc1161de7f24496227c0 (diff) | |
| download | u-boot-fsl-qoriq-570dd7f441c2d2d2e83a9345608801c92e7d2c6f.tar.xz | |
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>
| -rw-r--r-- | arch/sh/Kconfig | 9 | ||||
| -rw-r--r-- | configs/sh7752evb_defconfig | 1 | ||||
| -rw-r--r-- | configs/sh7753evb_defconfig | 1 | ||||
| -rw-r--r-- | configs/sh7757lcr_defconfig | 1 | ||||
| -rw-r--r-- | configs/sh7785lcr_32bit_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/sh7752evb.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7753evb.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7757lcr.h | 1 |
8 files changed, 13 insertions, 4 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 685406b..ff8f5b5 100644 --- 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 124154c..1f7c6d0 100644 --- 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 9ff4121..35809e9 100644 --- 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 3066d97..ffcf961 100644 --- 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 7cf93b4..31b84ff 100644 --- 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 f06abbc..2d509a9 100644 --- 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 e400db0..c31dd7a 100644 --- 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 08bff1d..36afd5f 100644 --- 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 |