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>

diff --git a/arch/sh/cpu/sh2/cpu.c b/arch/sh/cpu/sh2/cpu.c
index 18479a4c40f3b6ddaafc771e7d6823791dce4e8f..a2f856f4594510f5aaeaa366894f03c1de2249a8 100644 (file)
--- a/arch/sh/cpu/sh2/cpu.c
+++ b/arch/sh/cpu/sh2/cpu.c
@@ -23,11 +23,7 @@
 
 int checkcpu(void)
 {
-#if defined(CONFIG_SH2A)
-       puts("CPU: SH2A\n");
-#else
        puts("CPU: SH2\n");
-#endif
        return 0;
 }
 

diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index 91133a38aee345a697ef52f24ec25b0d62d7ab6e..e8ee0a45ab93cd9f42c48110cc381a90724001ae 100644 (file)
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -13,11 +13,7 @@
 
 int checkcpu(void)
 {
-#ifdef CONFIG_SH4A
-       puts("CPU: SH-4A\n");
-#else
        puts("CPU: SH4\n");
-#endif
        return 0;
 }
 

diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
index b21dc4422ed21355fa717228a6a4d51b98e79227..0698a377595df89d71e40ce62f0c1a402a98e49f 100644 (file)
--- a/arch/sh/include/asm/cache.h
+++ b/arch/sh/include/asm/cache.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_SH_CACHE_H
 #define __ASM_SH_CACHE_H
 
-#if defined(CONFIG_SH4) || defined(CONFIG_SH4A)
+#if defined(CONFIG_SH4)
 
 int cache_control(unsigned int cmd);
 
@@ -18,7 +18,7 @@ struct __large_struct { unsigned long buf[100]; };
  */
 #define ARCH_DMA_MINALIGN      32
 
-#endif /* CONFIG_SH4 || CONFIG_SH4A */
+#endif /* CONFIG_SH4 */
 
 /*
  * Use the L1 data cache line size value for the minimum DMA buffer alignment

diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
index 938a89cff50b1b54ea418aab1889b923364591a7..c3441ff558569b3ae53f6568cd98519e74fe0279 100644 (file)
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -3,10 +3,9 @@
 #if defined(CONFIG_SH2) || \
        defined (CONFIG_SH2A)
 # include <asm/cpu_sh2.h>
-#elif defined (CONFIG_SH3)
+#elif defined(CONFIG_SH3)
 # include <asm/cpu_sh3.h>
-#elif defined (CONFIG_SH4) || \
-       defined (CONFIG_SH4A)
+#elif defined(CONFIG_SH4)
 # include <asm/cpu_sh4.h>
 #endif
 #endif

diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 0162c3b04ebeeb4961060dafb12358bc35feac52..bb39491f8b6d329d8b017af7ed2dd6d0bc3c9eed 100644 (file)
--- 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 ee9bd0731fb723c4b4a414df8206568802421ec9..3a5cc74829cc37db26ba6babb10bcd96457eed21 100644 (file)
--- 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 0bb7cc54bd266301b1640a164e9a42d7900f49f7..53128ecc12045717643455dafe4340b100f8b58b 100644 (file)
--- 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 3574c52cc135bc536ee8a9bd937aed86a4cb2d83..8156724f7f6c3d63f68b87be06a78637abc9154e 100644 (file)
--- 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 d4d45b4c5692edb8fbf7828f63f71274ace0aa33..f06abbca0c210deec791eb36701a074f25f4f703 100644 (file)
--- 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 fa6e74a3928bcbf36e9035b323e616bea06ccb66..e400db08ad9b4667d3c34c8c613081b6b9cd23f7 100644 (file)
--- 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 5752dbb3b2882e691953c5b98ce4a43b0ffe5b21..08bff1da3fa227b012eca0b96a1ecf685d7afa15 100644 (file)
--- 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 95f5a28402278bf0edd873d15f9e212712a1e843..2723eaf2d3d9f50624930e2ca0a16cc4906401f6 100644 (file)
--- 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 f5b42faea418aff5857849810172f824f3fd677b..61afc7136d7c1ea8c84c7ef17d1b917ac3051a59 100644 (file)
--- 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;