diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-06 15:55:21 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2014-11-13 08:47:58 +0900 |
| commit | 7d2366627e1f4d1dbf80e65d5bf72b832ca128c9 (patch) | |
| tree | e405318a2fea1588cabc452046665a0e069f7452 /arch/sh/include | |
| parent | 0e29429f76e5578771c80c6d9e160440944a77f2 (diff) | |
| download | talos-obmc-uboot-7d2366627e1f4d1dbf80e65d5bf72b832ca128c9.tar.gz talos-obmc-uboot-7d2366627e1f4d1dbf80e65d5bf72b832ca128c9.zip | |
sh: move CONFIG_{SH2, SH2A, SH3, SH4} to Kconfig
This commit moves CONFIG_SH2, CONFIG_SH2A, CONFIG_SH3, CONFIG_SH4
to Kconfig renaming into CONFIG_CPU_SH2, CONFIG_CPU_SH2A,
CONFIG_CPU_SH3, CONFIG_CPU_SH4, respectively because
arch/sh/Kconfig of Linux uses CONFIG_CPU_SH* convention.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/cache.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/processor.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h index 0698a37759..abaf4050c3 100644 --- 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) +#if defined(CONFIG_CPU_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 */ +#endif /* CONFIG_CPU_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 b8677da959..b07fe542e3 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h @@ -1,10 +1,10 @@ #ifndef _ASM_SH_PROCESSOR_H_ #define _ASM_SH_PROCESSOR_H_ -#if defined(CONFIG_SH2) +#if defined(CONFIG_CPU_SH2) # include <asm/cpu_sh2.h> -#elif defined(CONFIG_SH3) +#elif defined(CONFIG_CPU_SH3) # include <asm/cpu_sh3.h> -#elif defined(CONFIG_SH4) +#elif defined(CONFIG_CPU_SH4) # include <asm/cpu_sh4.h> #endif #endif |
