Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit bdde65951659fb78d3b4bbf99743a74522f03a05

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent d4a9b17df5
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 3 changed files with 10 additions and 8 deletions Side-by-side Diff

... ... @@ -11,6 +11,9 @@
11 11 config MCF52x2
12 12 bool
13 13  
  14 +config MCF530x
  15 + bool
  16 +
14 17 # processor type
15 18 config M5208
16 19 bool
... ... @@ -40,6 +43,10 @@
40 43 bool
41 44 select MCF52x2
42 45  
  46 +config M5307
  47 + bool
  48 + select MCF530x
  49 +
43 50 choice
44 51 prompt "Target select"
45 52  
... ... @@ -114,6 +121,7 @@
114 121  
115 122 config TARGET_AMCORE
116 123 bool "Support AMCORE"
  124 + select M5307
117 125  
118 126 endchoice
119 127  
arch/m68k/cpu/mcf530x/config.mk
Diff comments   View file @ bdde659
... ... @@ -4,10 +4,7 @@
4 4 # SPDX-License-Identifier: GPL-2.0+
5 5 #
6 6  
7   -cfg=$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME:"%"=%).h
8   -is5307:=$(shell grep CONFIG_M5307 $(cfg))
  7 +cpuflags-$(CONFIG_M5307) := -mcpu=5307
9 8  
10   -ifneq (,$(findstring CONFIG_M5307,$(is5307)))
11   -PLATFORM_CPPFLAGS += -mcpu=5307
12   -endif
  9 +PLATFORM_CPPFLAGS += $(cpuflags-y)
include/configs/amcore.h
Diff comments   View file @ bdde659
... ... @@ -12,9 +12,6 @@
12 12 #define CONFIG_AMCORE
13 13 #define CONFIG_HOSTNAME AMCORE
14 14  
15   -#define CONFIG_MCF530x
16   -#define CONFIG_M5307
17   -
18 15 #define CONFIG_MCFTMR
19 16 #define CONFIG_MCFUART
20 17 #define CONFIG_SYS_UART_PORT 0