m68k: mcf52x2: move CPU type to Kconfig and refactor config.mk

This commit intends to stop grepping CPU type in
arch/m68k/cpu/mcf52x2/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/mcf52x2/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 53c4aabe1e27533dbd9db9913b7c2371de6ab169..0bd780ae2f800fde670a76351e69ef1a9628711c 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,6 +4,42 @@ menu "M68000 architecture"
 config SYS_ARCH
        default "m68k"
 
 config SYS_ARCH
        default "m68k"
 

+# processor family
+config MCF520x
+       bool
+
+config MCF52x2
+       bool
+
+# processor type
+config M5208
+       bool
+       select MCF520x
+
+config M5249
+       bool
+       select MCF52x2
+
+config M5253
+       bool
+       select MCF52x2
+
+config M5271
+       bool
+       select MCF52x2
+
+config M5272
+       bool
+       select MCF52x2
+
+config M5275
+       bool
+       select MCF52x2
+
+config M5282
+       bool
+       select MCF52x2
+

 choice
        prompt "Target select"
 
 choice
        prompt "Target select"
 


@@ -15,30 +51,39 @@ config TARGET_M5235EVB
 
 config TARGET_COBRA5272
        bool "Support cobra5272"
 
 config TARGET_COBRA5272
        bool "Support cobra5272"

+       select M5272

 
 config TARGET_EB_CPU5282
        bool "Support eb_cpu5282"
 
 config TARGET_EB_CPU5282
        bool "Support eb_cpu5282"

+       select M5282

 
 config TARGET_M5208EVBE
        bool "Support M5208EVBE"
 
 config TARGET_M5208EVBE
        bool "Support M5208EVBE"

+       select M5208

 
 config TARGET_M5249EVB
        bool "Support M5249EVB"
 
 config TARGET_M5249EVB
        bool "Support M5249EVB"

+       select M5249

 
 config TARGET_M5253DEMO
        bool "Support M5253DEMO"
 
 config TARGET_M5253DEMO
        bool "Support M5253DEMO"

+       select M5253

 
 config TARGET_M5253EVBE
        bool "Support M5253EVBE"
 
 config TARGET_M5253EVBE
        bool "Support M5253EVBE"

+       select M5253

 
 config TARGET_M5272C3
        bool "Support M5272C3"
 
 config TARGET_M5272C3
        bool "Support M5272C3"

+       select M5272

 
 config TARGET_M5275EVB
        bool "Support M5275EVB"
 
 config TARGET_M5275EVB
        bool "Support M5275EVB"

+       select M5275

 
 config TARGET_M5282EVB
        bool "Support M5282EVB"
 
 config TARGET_M5282EVB
        bool "Support M5282EVB"

+       select M5282

 
 config TARGET_ASTRO_MCF5373L
        bool "Support astro_mcf5373l"
 
 config TARGET_ASTRO_MCF5373L
        bool "Support astro_mcf5373l"

diff --git a/arch/m68k/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk
index f66000b33124ca04c9ce81f838867cf6338c7709..f8fdefd21bc3f5c69d37efb46a9747511e70d7e2 100644 (file)
--- a/arch/m68k/cpu/mcf52x2/config.mk
+++ b/arch/m68k/cpu/mcf52x2/config.mk
@@ -7,33 +7,12 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
 # SPDX-License-Identifier:     GPL-2.0+
 #
 

-cfg=$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME:"%"=%).h
-is5208:=$(shell grep CONFIG_M5208 $(cfg))
-is5249:=$(shell grep CONFIG_M5249 $(cfg))
-is5253:=$(shell grep CONFIG_M5253 $(cfg))
-is5271:=$(shell grep CONFIG_M5271 $(cfg))
-is5272:=$(shell grep CONFIG_M5272 $(cfg))
-is5275:=$(shell grep CONFIG_M5275 $(cfg))
-is5282:=$(shell grep CONFIG_M5282 $(cfg))
+cpuflags-$(CONFIG_M5208) := -mcpu=5208
+cpuflags-$(CONFIG_M5249) := -mcpu=5249
+cpuflags-$(CONFIG_M5253) := -mcpu=5253
+cpuflags-$(CONFIG_M5271) := -mcpu=5271
+cpuflags-$(CONFIG_M5272) := -mcpu=5272
+cpuflags-$(CONFIG_M5275) := -mcpu=5275
+cpuflags-$(CONFIG_M5282) := -mcpu=5282

 
 

-ifneq (,$(findstring CONFIG_M5208,$(is5208)))
-PLATFORM_CPPFLAGS += -mcpu=5208
-endif
-ifneq (,$(findstring CONFIG_M5249,$(is5249)))
-PLATFORM_CPPFLAGS += -mcpu=5249
-endif
-ifneq (,$(findstring CONFIG_M5253,$(is5253)))
-PLATFORM_CPPFLAGS += -mcpu=5253
-endif
-ifneq (,$(findstring CONFIG_M5271,$(is5271)))
-PLATFORM_CPPFLAGS += -mcpu=5271
-endif
-ifneq (,$(findstring CONFIG_M5272,$(is5272)))
-PLATFORM_CPPFLAGS += -mcpu=5272
-endif
-ifneq (,$(findstring CONFIG_M5275,$(is5275)))
-PLATFORM_CPPFLAGS += -mcpu=5275
-endif
-ifneq (,$(findstring CONFIG_M5282,$(is5282)))
-PLATFORM_CPPFLAGS += -mcpu=5282
-endif
+PLATFORM_CPPFLAGS += $(cpuflags-y)

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 66303773c32b9f884268b6c32f0244ae721912a8..9390464b10d214ab375be8bf585adc4d93d04193 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -14,9 +14,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
  * High Level Configuration Options
  * (easy to change)
  */

-#define CONFIG_MCF520x         /* define processor family */
-#define CONFIG_M5208           /* define processor type */
-

 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_BAUDRATE                        115200

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index ae4fe45fce4ea9091da308da6d21931363f29a71..60e5b45942a0239b7120264e31617d79c702de53 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -18,9 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
  * High Level Configuration Options
  * (easy to change)
  */

-#define CONFIG_MCF52x2                 /* define processor family */
-#define CONFIG_M5249                   /* define processor type */
-

 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART
 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 3a1cbcae93604772c315d527cfeffeeed79cfff2..7421b57b0f0c3d850ab4ce7e10585253164d0945 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -7,8 +7,6 @@
 #ifndef _M5253DEMO_H
 #define _M5253DEMO_H
 
 #ifndef _M5253DEMO_H
 #define _M5253DEMO_H
 

-#define CONFIG_MCF52x2         /* define processor family */
-#define CONFIG_M5253           /* define processor type */

 #define CONFIG_M5253DEMO       /* define board type */
 
 #define CONFIG_MCFTMR
 #define CONFIG_M5253DEMO       /* define board type */
 
 #define CONFIG_MCFTMR

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index fabfdb93dbdbfdc6e39a82fd2afb4d35ea57b8f3..8fd3907ad88db23d353547b4408279e81f700825 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -8,8 +8,6 @@
 #ifndef _M5253EVBE_H
 #define _M5253EVBE_H
 
 #ifndef _M5253EVBE_H
 #define _M5253EVBE_H
 

-#define CONFIG_MCF52x2         /* define processor family */
-#define CONFIG_M5253           /* define processor type */

 #define CONFIG_M5253EVBE       /* define board type */
 
 #define CONFIG_MCFTMR
 #define CONFIG_M5253EVBE       /* define board type */
 
 #define CONFIG_MCFTMR

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 4c84126559d2c2b579f1caaf9fd727c7efd83528..2c056b114b542c0de2b6ecd9468b606333159c8d 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -17,9 +17,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
  * High Level Configuration Options
  * (easy to change)
  */

-#define CONFIG_MCF52x2         /* define processor family */
-#define CONFIG_M5272           /* define processor type */
-

 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART
 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 4dddab7c1dfee179d10c411a315c492fc6e20771..7eb31722daf3cbd6a8cd8fd8e20e51cfb5659c6a 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -21,8 +21,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
  * High Level Configuration Options
  * (easy to change)
  */

-#define CONFIG_MCF52x2                 /* define processor family */
-#define CONFIG_M5275                   /* define processor type */

 #define CONFIG_M5275EVB                        /* define board type */
 
 #define CONFIG_MCFTMR
 #define CONFIG_M5275EVB                        /* define board type */
 
 #define CONFIG_MCFTMR

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index fd970d0787f834c08cf23f2b901e49f013db54e9..569ad4201e16daf6c489c12db7f8e011ada5e63e 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -17,9 +17,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
  * High Level Configuration Options
  * (easy to change)
  */

-#define        CONFIG_MCF52x2          /* define processor family */
-#define CONFIG_M5282           /* define processor type */
-

 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART
 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 464436930db4c0d7b93186c22c7522235ff0e2e1..b9f0b0b123a26666f15fe3149ec7ecc10ab935d4 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -24,16 +24,6 @@
 #ifndef _CONFIG_COBRA5272_H
 #define _CONFIG_COBRA5272_H
 
 #ifndef _CONFIG_COBRA5272_H
 #define _CONFIG_COBRA5272_H
 

-/* ---
- * Define processor
- * possible values for Sentec board: only Coldfire M5272 processor supported
- * (please do not change)
- * ---
- */
-
-#define CONFIG_MCF52x2                 /* define processor family */
-#define CONFIG_M5272                   /* define processor type */
-

 /* ---
  * Defines processor clock - important for correct timings concerning serial
  * interface etc.
 /* ---
  * Defines processor clock - important for correct timings concerning serial
  * interface etc.

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index bdca7058747c6dccec76eb262228d2c3bcb117e7..e2b93268b4c7ee82234361a475be0a86314ac94e 100644 (file)
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -15,9 +15,6 @@
  * High Level Configuration Options (easy to change)                    *
  *----------------------------------------------------------------------*/
 
  * High Level Configuration Options (easy to change)                    *
  *----------------------------------------------------------------------*/
 

-#define        CONFIG_MCF52x2                  /* define processor family */
-#define CONFIG_M5282                   /* define processor type */
-

 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_MCFUART
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_MCFUART