m68k: mcf547x_8x: move CPU type to Kconfig and refactor 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/mcf547x_8x/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 a3f0cbc2a447828aa8f5abb5d0fbdaf3573050c9..69cb0f73eb6b738463ebf1fc908f20ed1d373d7b 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -35,6 +35,9 @@ config MCF5445x
 config MCF5227x
        bool
 
+config MCF547x_8x
+       bool
+
 # processor type
 config M5208
        bool
@@ -101,6 +104,14 @@ config M52277
        bool
        select MCF5227x
 
+config M547x
+       bool
+       select MCF547x_8x
+
+config M548x
+       bool
+       select MCF547x_8x
+
 choice
        prompt "Target select"
 
@@ -178,9 +189,11 @@ config TARGET_M54455EVB
 
 config TARGET_M5475EVB
        bool "Support M5475EVB"
+       select M547x
 
 config TARGET_M5485EVB
        bool "Support M5485EVB"
+       select M548x
 
 config TARGET_AMCORE
        bool "Support AMCORE"

diff --git a/arch/m68k/cpu/mcf547x_8x/config.mk b/arch/m68k/cpu/mcf547x_8x/config.mk
index 825f6ccebe160a834ccea7d2ce9b84bbdf319176..240dd27b932b713416bbf1d1c23177cfcf5bc889 100644 (file)
--- a/arch/m68k/cpu/mcf547x_8x/config.mk
+++ b/arch/m68k/cpu/mcf547x_8x/config.mk
@@ -7,7 +7,9 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC
+cpuflags-$(CONFIG_MCF547x_8x) := -mcpu=5485 -fPIC
+
+PLATFORM_CPPFLAGS += $(cpuflags-y)
 
 ifneq (,$(findstring -linux-,$(shell $(CC) --version)))
 ifneq (,$(findstring GOT,$(shell $(LD) --help)))

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 2f4549f270711afdf6b36a036399fdf9b938b8ff..91d6a1ada92e35c2cfc6c146b02f9e29a158f7cf 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -18,9 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF547x_8x      /* define processor family */
-#define CONFIG_M547x           /* define processor type */
-#define CONFIG_M5475           /* define processor type */
 
 #define CONFIG_DISPLAY_BOARDINFO
 

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 9aa02f7c6c6e41cb67ce8624e92bf644c541e6dc..ce9f3b01b2e530ea82e7bdbee163df74a6d8421e 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -18,9 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF547x_8x      /* define processor family */
-#define CONFIG_M548x           /* define processor type */
-#define CONFIG_M5485           /* define processor type */
 
 #define CONFIG_DISPLAY_BOARDINFO