Commit 6b87abe3 authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu

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: default avatarNobuhiro Iwamatsu <iwamatsu@nigauri.org>
parent 8f0960e8
......@@ -23,11 +23,7 @@
int checkcpu(void)
{
#if defined(CONFIG_SH2A)
puts("CPU: SH2A\n");
#else
puts("CPU: SH2\n");
#endif
return 0;
}
......
......@@ -13,11 +13,7 @@
int checkcpu(void)
{
#ifdef CONFIG_SH4A
puts("CPU: SH-4A\n");
#else
puts("CPU: SH4\n");
#endif
return 0;
}
......
#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
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -10,7 +10,6 @@
#define __SH7785LCR_H
#undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7785 1
#define CONFIG_SH7785LCR 1
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment