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

This commit intends to stop grepping CPU type in
arch/m68k/cpu/mcf5445x/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/mcf5445x/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 67308eb0034d769518e1519378053fcd0bd4ada0..eecef959f8d3e1679ec62bcd4e238c587888ce38 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -23,6 +23,12 @@ config MCF532x
 config MCF537x
        bool
 
+config MCF5441x
+       bool
+
+config MCF5445x
+       bool
+
 # processor type
 config M5208
        bool
@@ -69,6 +75,18 @@ config M5373
        select MCF532x
        select MCF537x
 
+config M54418
+       bool
+       select MCF5441x
+
+config M54451
+       bool
+       select MCF5445x
+
+config M54455
+       bool
+       select MCF5445x
+
 choice
        prompt "Target select"
 
@@ -132,12 +150,15 @@ config TARGET_M5373EVB
 
 config TARGET_M54418TWR
        bool "Support M54418TWR"
+       select M54418
 
 config TARGET_M54451EVB
        bool "Support M54451EVB"
+       select M54451
 
 config TARGET_M54455EVB
        bool "Support M54455EVB"
+       select M54455
 
 config TARGET_M5475EVB
        bool "Support M5475EVB"

diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk
index 13f8a9f57b600f312d9eceffdc91dc6e693da109..c3923c63eadd49e1c21b1ffeb081fb4e68adcca1 100644 (file)
--- a/arch/m68k/cpu/mcf5445x/config.mk
+++ b/arch/m68k/cpu/mcf5445x/config.mk
@@ -9,14 +9,8 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-cfg=$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME:"%"=%).h
-is5441x:=$(shell grep CONFIG_MCF5441x $(cfg))
-
-ifneq (,$(findstring CONFIG_MCF5441x,$(is5441x)))
-PLATFORM_CPPFLAGS += -mcpu=54418 -fPIC
-else
-PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC
-endif
+cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC
+cpuflags-$(CONFIG_MCF5445x) := -mcpu=54455 -fPIC
 
 ifneq (,$(findstring -linux-,$(shell $(CC) --version)))
 ifneq (,$(findstring GOT,$(shell $(LD) --help)))

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 3d7dc1fb2dd0f0fb898edb16e251379e42902aae..be1750f62780b009e4b530c81c5b3850a8e92cd7 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF5441x        /* define processor family */
-#define CONFIG_M54418          /* define processor type */
 #define CONFIG_M54418TWR       /* M54418TWR board */
 
 #define CONFIG_MCFUART

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 734a77fb4ff5e79e0a7f4e56e4a1046e0c76331b..1b3598a092cfa3d95b75e92f241ea8f5f1e9622d 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF5445x                /* define processor family */
-#define CONFIG_M54451          /* define processor type */
 #define CONFIG_M54451EVB       /* M54451EVB board */
 
 #define CONFIG_DISPLAY_BOARDINFO

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 2faf58156d89b444b19667d616f08c53cbfe7e5a..2288bff56d42e7d08e051102f799a480ed416b71 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF5445x                /* define processor family */
-#define CONFIG_M54455          /* define processor type */
 #define CONFIG_M54455EVB       /* M54455EVB board */
 
 #define CONFIG_DISPLAY_BOARDINFO