Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 10:39:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sh: sh4: Remove CONFIG_SH4A definition from source code

Browse source 
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>
This commit is contained in:
Nobuhiro Iwamatsu 2014-01-09 12:22:12 +09:00
parent 8f0960e837
commit 6b87abe3ac
13 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/sh/cpu/sh2/cpu.c
View file

@ -23,11 +23,7 @@
int checkcpu(void) int checkcpu(void)
{ {
#if defined(CONFIG_SH2A)
puts("CPU: SH2A\n");
#else
puts("CPU: SH2\n"); puts("CPU: SH2\n");
#endif
return 0; return 0;
} }

4
arch/sh/cpu/sh4/cpu.c
View file

@ -13,11 +13,7 @@
int checkcpu(void) int checkcpu(void)
{ {
#ifdef CONFIG_SH4A
puts("CPU: SH-4A\n");
#else
puts("CPU: SH4\n"); puts("CPU: SH4\n");
#endif
return 0; return 0;
} }

4
arch/sh/include/asm/cache.h
View file

@ -1,7 +1,7 @@
#ifndef __ASM_SH_CACHE_H #ifndef __ASM_SH_CACHE_H
#define __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); int cache_control(unsigned int cmd);
@ -18,7 +18,7 @@ struct __large_struct { unsigned long buf[100]; };
*/ */
#define ARCH_DMA_MINALIGN 32 #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 * Use the L1 data cache line size value for the minimum DMA buffer alignment

5
arch/sh/include/asm/processor.h
View file

@ -3,10 +3,9 @@
#if defined(CONFIG_SH2) || \ #if defined(CONFIG_SH2) || \
defined (CONFIG_SH2A) defined (CONFIG_SH2A)
# include <asm/cpu_sh2.h> # include <asm/cpu_sh2.h>
#elif defined (CONFIG_SH3) #elif defined(CONFIG_SH3)
# include <asm/cpu_sh3.h> # include <asm/cpu_sh3.h>
#elif defined (CONFIG_SH4) || \ #elif defined(CONFIG_SH4)
defined (CONFIG_SH4A)
# include <asm/cpu_sh4.h> # include <asm/cpu_sh4.h>
#endif #endif
#endif #endif

1
include/configs/ap_sh4a_4a.h
View file

@ -10,7 +10,6 @@
#define __AP_SH4A_4A_H #define __AP_SH4A_4A_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7734 1 #define CONFIG_CPU_SH7734 1
#define CONFIG_AP_SH4A_4A 1 #define CONFIG_AP_SH4A_4A 1
#define CONFIG_400MHZ_MODE 1 #define CONFIG_400MHZ_MODE 1

1
include/configs/ecovec.h
View file

@ -23,7 +23,6 @@
*/ */
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7724 1 #define CONFIG_CPU_SH7724 1
#define CONFIG_BOARD_LATE_INIT 1 #define CONFIG_BOARD_LATE_INIT 1
#define CONFIG_ECOVEC 1 #define CONFIG_ECOVEC 1

1
include/configs/r0p7734.h
View file

@ -10,7 +10,6 @@
#define __R0P7734_H #define __R0P7734_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7734 1 #define CONFIG_CPU_SH7734 1
#define CONFIG_R0P7734 1 #define CONFIG_R0P7734 1
#define CONFIG_400MHZ_MODE 1 #define CONFIG_400MHZ_MODE 1

1
include/configs/r7780mp.h
View file

@ -11,7 +11,6 @@
#define __R7780RP_H #define __R7780RP_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7780 1 #define CONFIG_CPU_SH7780 1
#define CONFIG_R7780MP 1 #define CONFIG_R7780MP 1
#define CONFIG_SYS_R7780MP_OLD_FLASH 1 #define CONFIG_SYS_R7780MP_OLD_FLASH 1

1
include/configs/sh7752evb.h
View file

@ -10,7 +10,6 @@
#define __SH7752EVB_H #define __SH7752EVB_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_SH_32BIT 1 #define CONFIG_SH_32BIT 1
#define CONFIG_CPU_SH7752 1 #define CONFIG_CPU_SH7752 1
#define CONFIG_SH7752EVB 1 #define CONFIG_SH7752EVB 1

1
include/configs/sh7753evb.h
View file

@ -10,7 +10,6 @@
#define __SH7753EVB_H #define __SH7753EVB_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_SH_32BIT 1 #define CONFIG_SH_32BIT 1
#define CONFIG_CPU_SH7753 1 #define CONFIG_CPU_SH7753 1
#define CONFIG_SH7753EVB 1 #define CONFIG_SH7753EVB 1

1
include/configs/sh7757lcr.h
View file

@ -10,7 +10,6 @@
#define __SH7757LCR_H #define __SH7757LCR_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_SH_32BIT 1 #define CONFIG_SH_32BIT 1
#define CONFIG_CPU_SH7757 1 #define CONFIG_CPU_SH7757 1
#define CONFIG_SH7757LCR 1 #define CONFIG_SH7757LCR 1

1
include/configs/sh7785lcr.h
View file

@ -10,7 +10,6 @@
#define __SH7785LCR_H #define __SH7785LCR_H
#undef DEBUG #undef DEBUG
#define CONFIG_SH4A 1
#define CONFIG_CPU_SH7785 1 #define CONFIG_CPU_SH7785 1
#define CONFIG_SH7785LCR 1 #define CONFIG_SH7785LCR 1

2
include/sh_tmu.h
View file

@ -47,7 +47,7 @@ struct tmu_regs {
}; };
#endif /* CONFIG_SH3 */ #endif /* CONFIG_SH3 */
#if defined(CONFIG_SH4) || defined(CONFIG_SH4A) || defined(CONFIG_RMOBILE) #if defined(CONFIG_SH4) || defined(CONFIG_RMOBILE)
struct tmu_regs { struct tmu_regs {
u32 reserved; u32 reserved;
u8 tstr; u8 tstr;