diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2014-01-09 12:22:12 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2014-01-09 12:47:15 +0900 |
| commit | 6b87abe3ac357649a990c05a6a5f9fd232cca21c (patch) | |
| tree | f121f7d1e2f4bae0b22ae92706a493c3c13c2399 /include | |
| parent | 8f0960e8378e0fc14d6216f60910994c217d3d57 (diff) | |
| download | talos-obmc-uboot-6b87abe3ac357649a990c05a6a5f9fd232cca21c.tar.gz talos-obmc-uboot-6b87abe3ac357649a990c05a6a5f9fd232cca21c.zip | |
sh: sh4: Remove CONFIG_SH4A definition from source code
SH4 and SH4A are compatible. But some instructions are different from these.
In Linux kernel, It is treated as a separate CPU, but for now, I think that
there is no need to divide especially in the U-Boot.
This removes CONFIG_SH4A definition from source code, SH4A is treated as SH4.
And this fix white space.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ap_sh4a_4a.h | 1 | ||||
| -rw-r--r-- | include/configs/ecovec.h | 1 | ||||
| -rw-r--r-- | include/configs/r0p7734.h | 1 | ||||
| -rw-r--r-- | include/configs/r7780mp.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7752evb.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7753evb.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7757lcr.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7785lcr.h | 1 | ||||
| -rw-r--r-- | include/sh_tmu.h | 2 |
9 files changed, 1 insertions, 9 deletions
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 0162c3b04e..bb39491f8b 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -10,7 +10,6 @@ #define __AP_SH4A_4A_H #undef DEBUG -#define CONFIG_SH4A 1 #define CONFIG_CPU_SH7734 1 #define CONFIG_AP_SH4A_4A 1 #define CONFIG_400MHZ_MODE 1 diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index ee9bd0731f..3a5cc74829 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -23,7 +23,6 @@ */ #undef DEBUG -#define CONFIG_SH4A 1 #define CONFIG_CPU_SH7724 1 #define CONFIG_BOARD_LATE_INIT 1 #define CONFIG_ECOVEC 1 diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 0bb7cc54bd..53128ecc12 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -10,7 +10,6 @@ #define __R0P7734_H #undef DEBUG -#define CONFIG_SH4A 1 #define CONFIG_CPU_SH7734 1 #define CONFIG_R0P7734 1 #define CONFIG_400MHZ_MODE 1 diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 3574c52cc1..8156724f7f 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -11,7 +11,6 @@ #define __R7780RP_H #undef DEBUG -#define CONFIG_SH4A 1 #define CONFIG_CPU_SH7780 1 #define CONFIG_R7780MP 1 #define CONFIG_SYS_R7780MP_OLD_FLASH 1 diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index d4d45b4c56..f06abbca0c 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -10,7 +10,6 @@ #define __SH7752EVB_H #undef DEBUG -#define CONFIG_SH4A 1 #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 fa6e74a392..e400db08ad 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -10,7 +10,6 @@ #define __SH7753EVB_H #undef DEBUG -#define CONFIG_SH4A 1 #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 5752dbb3b2..08bff1da3f 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -10,7 +10,6 @@ #define __SH7757LCR_H #undef DEBUG -#define CONFIG_SH4A 1 #define CONFIG_SH_32BIT 1 #define CONFIG_CPU_SH7757 1 #define CONFIG_SH7757LCR 1 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 95f5a28402..2723eaf2d3 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -10,7 +10,6 @@ #define __SH7785LCR_H #undef DEBUG -#define CONFIG_SH4A 1 #define CONFIG_CPU_SH7785 1 #define CONFIG_SH7785LCR 1 diff --git a/include/sh_tmu.h b/include/sh_tmu.h index f5b42faea4..61afc7136d 100644 --- a/include/sh_tmu.h +++ b/include/sh_tmu.h @@ -47,7 +47,7 @@ struct tmu_regs { }; #endif /* CONFIG_SH3 */ -#if defined(CONFIG_SH4) || defined(CONFIG_SH4A) || defined(CONFIG_RMOBILE) +#if defined(CONFIG_SH4) || defined(CONFIG_RMOBILE) struct tmu_regs { u32 reserved; u8 tstr; |
