V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Masahiro Yamada 2015-03-27 17:01:08 +09:00 committed by Tom Rini
parent bdde659516
commit c155ab74f7
6 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/m68k/Kconfig
View File

@ -14,6 +14,15 @@ config MCF52x2
config MCF530x config MCF530x
bool bool
config MCF5301x
bool
config MCF532x
bool
config MCF537x
bool
# processor type # processor type
config M5208 config M5208
bool bool
@ -47,6 +56,19 @@ config M5307
bool bool
select MCF530x select MCF530x
config M53015
bool
select MCF5301x
config M5329
bool
select MCF532x
config M5373
bool
select MCF532x
select MCF537x
choice choice
prompt "Target select" prompt "Target select"
@ -94,15 +116,19 @@ config TARGET_M5282EVB
config TARGET_ASTRO_MCF5373L config TARGET_ASTRO_MCF5373L
bool "Support astro_mcf5373l" bool "Support astro_mcf5373l"
select M5373
config TARGET_M53017EVB config TARGET_M53017EVB
bool "Support M53017EVB" bool "Support M53017EVB"
select M53015
config TARGET_M5329EVB config TARGET_M5329EVB
bool "Support M5329EVB" bool "Support M5329EVB"
select M5329
config TARGET_M5373EVB config TARGET_M5373EVB
bool "Support M5373EVB" bool "Support M5373EVB"
select M5373
config TARGET_M54418TWR config TARGET_M54418TWR
bool "Support M54418TWR" bool "Support M54418TWR"

12
arch/m68k/cpu/mcf532x/config.mk
View File

@ -7,13 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
cfg=$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME:"%"=%).h cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC
is5301x:=$(shell grep CONFIG_MCF5301x $(cfg)) cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC
is532x:=$(shell grep CONFIG_MCF532x $(cfg))
ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x))) PLATFORM_CPPFLAGS += $(cpuflags-y)
PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC
endif
ifneq (,$(findstring CONFIG_MCF532x,$(is532x)))
PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC
endif

2
include/configs/M53017EVB.h
View File

@ -18,8 +18,6 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MCF5301x /* define processor family */
#define CONFIG_M53015 /* define processor type */
#define CONFIG_MCFUART #define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0) #define CONFIG_SYS_UART_PORT (0)

2
include/configs/M5329EVB.h
View File

@ -18,8 +18,6 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MCF532x /* define processor family */
#define CONFIG_M5329 /* define processor type */
#define CONFIG_MCFUART #define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0) #define CONFIG_SYS_UART_PORT (0)

2
include/configs/M5373EVB.h
View File

@ -18,8 +18,6 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MCF532x /* define processor family */
#define CONFIG_M5373 /* define processor type */
#define CONFIG_MCFUART #define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0) #define CONFIG_SYS_UART_PORT (0)

10
include/configs/astro_mcf5373l.h
View File

@ -39,16 +39,6 @@
#error No card type defined! #error No card type defined!
#endif #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 */ #define CONFIG_ASTRO5373L /* define board type */
/* Command line configuration */ /* Command line configuration */