diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-27 17:01:12 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-28 09:03:09 -0400 |
| commit | 4cbd29284dcf5c1da9e7bc170e4c3c6a52c988f3 (patch) | |
| tree | ba2432d1cf8442656f202e934233e80cd046f039 | |
| parent | f47fb6b4a0082d1a9da03cec86150a5af4131eb3 (diff) | |
| download | talos-obmc-uboot-4cbd29284dcf5c1da9e7bc170e4c3c6a52c988f3.tar.gz talos-obmc-uboot-4cbd29284dcf5c1da9e7bc170e4c3c6a52c988f3.zip | |
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>
| -rw-r--r-- | arch/m68k/Kconfig | 13 | ||||
| -rw-r--r-- | arch/m68k/cpu/mcf547x_8x/config.mk | 4 | ||||
| -rw-r--r-- | include/configs/M5475EVB.h | 3 | ||||
| -rw-r--r-- | include/configs/M5485EVB.h | 3 |
4 files changed, 16 insertions, 7 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index a3f0cbc2a4..69cb0f73eb 100644 --- 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 825f6ccebe..240dd27b93 100644 --- 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 2f4549f270..91d6a1ada9 100644 --- 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 9aa02f7c6c..ce9f3b01b2 100644 --- 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 |
