summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-27 17:01:07 +0900
committerTom Rini <trini@konsulko.com>2015-03-28 09:03:09 -0400
commitbdde65951659fb78d3b4bbf99743a74522f03a05 (patch)
treead8e0af1ca8869766b27c3feeb93f3650b536128
parentd4a9b17df590c1b0b2a187e1491ea7e946a06a07 (diff)
m68k: mcf530x: move CPU type to Kconfig and refactor config.mk
This commit intends to stop grepping CPU type in arch/m68k/cpu/mcf530x/config.mk. Move the CPU type config options from include/configs/amcore.h to arch/m68k/Kconfig and refactor the CPU flags select in arch/m68k/cpu/mcf530x/config.mk. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Alison Wang <alison.wang@freescale.com> Cc: Angelo Dureghello <angelo@sysam.it>
-rw-r--r--arch/m68k/Kconfig8
-rw-r--r--arch/m68k/cpu/mcf530x/config.mk7
-rw-r--r--include/configs/amcore.h3
3 files changed, 10 insertions, 8 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 0bd780ae2f8..8f9b4a71673 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -11,6 +11,9 @@ config MCF520x
config MCF52x2
bool
+config MCF530x
+ bool
+
# processor type
config M5208
bool
@@ -40,6 +43,10 @@ config M5282
bool
select MCF52x2
+config M5307
+ bool
+ select MCF530x
+
choice
prompt "Target select"
@@ -114,6 +121,7 @@ config TARGET_M5485EVB
config TARGET_AMCORE
bool "Support AMCORE"
+ select M5307
endchoice
diff --git a/arch/m68k/cpu/mcf530x/config.mk b/arch/m68k/cpu/mcf530x/config.mk
index aef72d70c50..25845aa3231 100644
--- a/arch/m68k/cpu/mcf530x/config.mk
+++ b/arch/m68k/cpu/mcf530x/config.mk
@@ -4,9 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-cfg=$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME:"%"=%).h
-is5307:=$(shell grep CONFIG_M5307 $(cfg))
+cpuflags-$(CONFIG_M5307) := -mcpu=5307
-ifneq (,$(findstring CONFIG_M5307,$(is5307)))
-PLATFORM_CPPFLAGS += -mcpu=5307
-endif
+PLATFORM_CPPFLAGS += $(cpuflags-y)
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 37aa1249fce..229fa5a6c2d 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -12,9 +12,6 @@
#define CONFIG_AMCORE
#define CONFIG_HOSTNAME AMCORE
-#define CONFIG_MCF530x
-#define CONFIG_M5307
-
#define CONFIG_MCFTMR
#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT 0