m68k: mcf532x: move CPU type to Kconfig and refactor config.mk

This commit intends to stop grepping CPU type in
arch/m68k/cpu/mcf532x/config.mk.

Move the CPU type config options from include/configs/*.h
to arch/m68k/Kconfig and refactor the CPU flags select in
arch/m68k/cpu/mcf532x/config.mk.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Alison Wang <alison.wang@freescale.com>
Cc: Angelo Dureghello <angelo@sysam.it>

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 8f9b4a7..67308eb 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -14,6 +14,15 @@ config MCF52x2
 config MCF530x
        bool
 
+config MCF5301x
+       bool
+
+config MCF532x
+       bool
+
+config MCF537x
+       bool
+
 # processor type
 config M5208
        bool
@@ -47,6 +56,19 @@ config M5307
        bool
        select MCF530x
 
+config M53015
+       bool
+       select MCF5301x
+
+config M5329
+       bool
+       select MCF532x
+
+config M5373
+       bool
+       select MCF532x
+       select MCF537x
+
 choice
        prompt "Target select"
 
@@ -94,15 +116,19 @@ config TARGET_M5282EVB
 
 config TARGET_ASTRO_MCF5373L
        bool "Support astro_mcf5373l"
+       select M5373
 
 config TARGET_M53017EVB
        bool "Support M53017EVB"
+       select M53015
 
 config TARGET_M5329EVB
        bool "Support M5329EVB"
+       select M5329
 
 config TARGET_M5373EVB
        bool "Support M5373EVB"
+       select M5373
 
 config TARGET_M54418TWR
        bool "Support M54418TWR"

diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk
index 2efb60f..470d22f 100644 (file)
--- a/arch/m68k/cpu/mcf532x/config.mk
+++ b/arch/m68k/cpu/mcf532x/config.mk
@@ -7,13 +7,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-cfg=$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME:"%"=%).h
-is5301x:=$(shell grep CONFIG_MCF5301x $(cfg))
-is532x:=$(shell grep CONFIG_MCF532x $(cfg))
+cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC
+cpuflags-$(CONFIG_MCF532x)  := -mcpu=5329 -fPIC
 
-ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x)))
-PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC
-endif
-ifneq (,$(findstring CONFIG_MCF532x,$(is532x)))
-PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC
-endif
+PLATFORM_CPPFLAGS += $(cpuflags-y)

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index a100d9f..83ac70f 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF5301x                /* define processor family */
-#define CONFIG_M53015          /* define processor type */
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 78ea384..795f359 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF532x         /* define processor family */
-#define CONFIG_M5329           /* define processor type */
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 849c265..d75b43c 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF532x         /* define processor family */
-#define CONFIG_M5373           /* define processor type */
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index fa64a68..de837cf 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -39,16 +39,6 @@
 #error No card type defined!
 #endif
 
-/*
- * Define processor
- * possible values for Urmel board: only Coldfire M5373 processor supported
- * (please do not change)
- */
-
-/* it seems not clear yet which processor defines we should use */
-#define CONFIG_MCF537x                 /* define processor family */
-#define CONFIG_MCF532x                 /* define processor family */
-#define CONFIG_M5373                   /* define processor type */
 #define CONFIG_ASTRO5373L              /* define board type */
 
 /* Command line configuration */