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>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 031ff6d5ee04020720ea26241d8d880fc0049e28..49b00da8fb0a397d635621143daded08f0e06fcc 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -4,71 +4,109 @@ menu "SuperH architecture"
 config SYS_ARCH
        default "sh"
 
+config CPU_SH2
+       bool
+
+config CPU_SH2A
+       bool
+       select CPU_SH2
+
+config CPU_SH3
+       bool
+
+config CPU_SH4
+       bool
+
+config CPU_SH4A
+       bool
+       select CPU_SH4
+
 choice
        prompt "Target select"
 
 config TARGET_RSK7203
        bool "RSK+ 7203"
+       select CPU_SH2A
 
 config TARGET_RSK7264
        bool "RSK2+SH7264"
+       select CPU_SH2A
 
 config TARGET_RSK7269
        bool "RSK2+SH7269"
+       select CPU_SH2A
 
 config TARGET_MPR2
        bool "Magic Panel Release 2 board"
+       select CPU_SH3
 
 config TARGET_MS7720SE
        bool "Support ms7720se"
+       select CPU_SH3
 
 config TARGET_SHMIN
        bool "SHMIN"
+       select CPU_SH3
 
 config TARGET_ESPT
        bool "Data Technology ESPT-GIGA board"
+       select CPU_SH4
 
 config TARGET_MS7722SE
        bool "SolutionEngine 7722"
+       select CPU_SH4
 
 config TARGET_MS7750SE
        bool "SolutionEngine 7750"
+       select CPU_SH4
 
 config TARGET_AP_SH4A_4A
        bool "ALPHAPROJECT AP-SH4A-4A"
+       select CPU_SH4
 
 config TARGET_AP325RXA
        bool "Renesas AP-325RXA"
+       select CPU_SH4
 
 config TARGET_ECOVEC
        bool "EcoVec"
+       select CPU_SH4
 
 config TARGET_MIGOR
        bool "Migo-R"
+       select CPU_SH4
 
 config TARGET_R0P7734
        bool "Support r0p7734"
+       select CPU_SH4
 
 config TARGET_R2DPLUS
        bool "Renesas R2D-PLUS"
+       select CPU_SH4
 
 config TARGET_R7780MP
        bool "R7780MP board"
+       select CPU_SH4
 
 config TARGET_SH7752EVB
        bool "SH7752EVB"
+       select CPU_SH4
 
 config TARGET_SH7753EVB
        bool "SH7753EVB"
+       select CPU_SH4
 
 config TARGET_SH7757LCR
        bool "SH7757LCR"
+       select CPU_SH4
 
 config TARGET_SH7763RDP
        bool "SH7763RDP"
+       select CPU_SH4
 
 config TARGET_SH7785LCR
        bool "SH7785LCR"
+       select CPU_SH4
 
 endchoice
 

diff --git a/arch/sh/cpu/sh2/config.mk b/arch/sh/cpu/sh2/config.mk
index 4904d76d44bb53672f2222d14855b8f89836467e..12e202d539a01deba8a66e62be9f4adb78c861e0 100644 (file)
--- a/arch/sh/cpu/sh2/config.mk
+++ b/arch/sh/cpu/sh2/config.mk
@@ -7,11 +7,11 @@
 #
 ENDIANNESS += -EB
 
-ifdef CONFIG_SH2A
+ifdef CONFIG_CPU_SH2A
 PLATFORM_CPPFLAGS += -m2a -m2a-nofpu -mb
 else # SH2
 PLATFORM_CPPFLAGS += -m3e -mb
 endif
-PLATFORM_CPPFLAGS += -DCONFIG_SH2 $(call cc-option,-mno-fdpic)
+PLATFORM_CPPFLAGS += $(call cc-option,-mno-fdpic)
 
 PLATFORM_LDFLAGS += $(ENDIANNESS)

diff --git a/arch/sh/cpu/sh3/config.mk b/arch/sh/cpu/sh3/config.mk
index 24b5c47859df6684f01230ef97ee364e20052857..dcafd19e583a470d3aaa6a3a65477c27e86fd25a 100644 (file)
--- a/arch/sh/cpu/sh3/config.mk
+++ b/arch/sh/cpu/sh3/config.mk
@@ -11,4 +11,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 #
-PLATFORM_CPPFLAGS += -DCONFIG_SH3 -m3
+PLATFORM_CPPFLAGS += -m3

diff --git a/arch/sh/cpu/sh4/config.mk b/arch/sh/cpu/sh4/config.mk
index 5773d4fec9cf181cc663d900e4737f8434c07cfb..4fb2dc23aaba30a5b3ece308b0440843e84cdedf 100644 (file)
--- a/arch/sh/cpu/sh4/config.mk
+++ b/arch/sh/cpu/sh4/config.mk
@@ -8,4 +8,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 #
-PLATFORM_CPPFLAGS += -DCONFIG_SH4 -m4-nofpu
+PLATFORM_CPPFLAGS += -m4-nofpu

diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
index 0698a377595df89d71e40ce62f0c1a402a98e49f..abaf4050c39904281fee78091ed20146e49536a0 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)
+#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 b8677da959358992714f9dd5f726630ac829dcf2..b07fe542e362d75cd1ad5d3c190a2dab58f36385 100644 (file)
--- 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

diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 8a84b24af193d771d8dc87139594cfb2aba4a749..1304f4ee93afb3458ed7b84e9764a87100ad4e9a 100644 (file)
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -8,7 +8,7 @@
 
 obj-y  += board.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
-ifeq ($(CONFIG_SH2),y)
+ifeq ($(CONFIG_CPU_SH2),y)
 obj-y  += time_sh2.o
 else
 obj-y  += time.o

diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index 53406e585548e5699c1e850edcc67f048bde30aa..ef88c8f27338acc2c3dc8ddd2c3381b0d84ac1f6 100644 (file)
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -433,7 +433,7 @@ static inline void sci_##name##_out(struct uart_port *port,\
                SCI_OUT(sci_size, sci_offset, value);\
        }
 
-#if defined(CONFIG_SH3) || \
+#if defined(CONFIG_CPU_SH3) || \
        defined(CONFIG_ARCH_SH7367) || \
        defined(CONFIG_ARCH_SH7377) || \
        defined(CONFIG_ARCH_SH7372) || \

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 5436324580384065e8760f06e4fa0114bd8642e0..e7f73872eedd00bfda45bb8557df7a2b5b0e1df5 100644 (file)
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -11,7 +11,6 @@
 #define __RSK7203_H
 
 #undef DEBUG
-#define CONFIG_SH2A            1
 #define CONFIG_CPU_SH7203      1
 #define CONFIG_RSK7203 1
 

diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 4aaa3ef74b73ba036b6879db26797866ce39c70a..2ecf785082623c06abe71b92365650243dceced2 100644 (file)
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -12,7 +12,6 @@
 #define __RSK7264_H
 
 #undef DEBUG
-#define CONFIG_SH2A            1
 #define CONFIG_CPU_SH7264      1
 #define CONFIG_RSK7264         1
 

diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 11fc231fa675419b5b64ca678e04387a50e13aa0..14c1da774d070231997d4cf2bdced0f455972ff4 100644 (file)
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -11,7 +11,6 @@
 #define __RSK7269_H
 
 #undef DEBUG
-#define CONFIG_SH2A            1
 #define CONFIG_CPU_SH7269      1
 #define CONFIG_RSK7269         1
 

diff --git a/include/sh_tmu.h b/include/sh_tmu.h
index 61afc7136d7c1ea8c84c7ef17d1b917ac3051a59..97d578dd55ad5ef1f0c8a873eb33386f261cbeb7 100644 (file)
--- a/include/sh_tmu.h
+++ b/include/sh_tmu.h
@@ -25,7 +25,7 @@
 
 #include <asm/types.h>
 
-#if defined(CONFIG_SH3)
+#if defined(CONFIG_CPU_SH3)
 struct tmu_regs {
        u8      tocr;
        u8      reserved0;
@@ -45,9 +45,9 @@ struct tmu_regs {
        u16     reserved4;
        u32     tcpr2;
 };
-#endif /* CONFIG_SH3 */
+#endif /* CONFIG_CPU_SH3 */
 
-#if defined(CONFIG_SH4) || defined(CONFIG_RMOBILE)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_RMOBILE)
 struct tmu_regs {
        u32 reserved;
        u8  tstr;
@@ -65,7 +65,7 @@ struct tmu_regs {
        u16 tcr2;
        u16 reserved5;
 };
-#endif /* CONFIG_SH4 */
+#endif /* CONFIG_CPU_SH4 */
 
 static inline unsigned long get_tmu0_clk_rate(void)
 {