ARM: UniPhier: move support card select to Kconfig

There are two kinds of expansion boards which are often used for
the UniPhier platform and they are only exclusively selectable.
It can be better described by the "choice" menu of Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 31a03d92928443d34303148584e1ebe503b6273f..1d96db21caeb705a19d8811f8547536c032406a6 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -27,6 +27,29 @@ config MACH_PH1_SLD8
 
 endchoice
 
+choice
+       prompt "UniPhier Support Card select"
+       optional
+
+config PFC_MICRO_SUPPORT_CARD
+       bool "Support card with PFC CPLD"
+       help
+         This option provides support for the expansion board with PFC
+         original address mapping.
+
+         Say Y to use the on-board UART, Ether, LED devices.
+
+config DCC_MICRO_SUPPORT_CARD
+       bool "Support card with DCC CPLD"
+       help
+         This option provides support for the expansion board with DCC-
+         arranged address mapping that is compatible with legacy UniPhier
+         reference boards.
+
+         Say Y to use the on-board UART, Ether, LED devices.
+
+endchoice
+
 config CMD_PINMON
        bool "Enable boot mode pins monitor command"
        depends on !SPL_BUILD

diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index de068e9c59ceeefcd7bcf1e80ab3fb32bd50bb7c..315534065d66fe3da3bae7a0668cb8ad4337f2e4 100644 (file)
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_UNIPHIER=y
 +S:CONFIG_MACH_PH1_LD4=y
++S:CONFIG_DCC_MICRO_SUPPORT_CARD=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BDI=y
 CONFIG_CMD_CONSOLE=y

diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index f4ddf5f27811f49b298bbd33b6d48c4aeb58ddf2..7ea4e6e879ba505c1cc7fc940c7486e9b2444c53 100644 (file)
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_UNIPHIER=y
 +S:CONFIG_MACH_PH1_PRO4=y
++S:CONFIG_DCC_MICRO_SUPPORT_CARD=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BDI=y
 CONFIG_CMD_CONSOLE=y

diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index ee14382804027d656ddf91c38c2908272c1f3e2f..ddf210cc0d83d3e7caa1d4447e80246a00e02724 100644 (file)
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_UNIPHIER=y
 +S:CONFIG_MACH_PH1_SLD8=y
++S:CONFIG_DCC_MICRO_SUPPORT_CARD=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BDI=y
 CONFIG_CMD_CONSOLE=y

diff --git a/include/configs/ph1_ld4.h b/include/configs/ph1_ld4.h
index 73a95e615ec9b2679d7513dce504926956fc0728..a3e4f96e027e0003999d0b186aacb4b8ecae1c20 100644 (file)
--- a/include/configs/ph1_ld4.h
+++ b/include/configs/ph1_ld4.h
@@ -8,21 +8,6 @@
 #ifndef __PH1_XXX_H
 #define __PH1_XXX_H
 
-/*
- * Support Card Select
- *
- *  CONFIG_PFC_MICRO_SUPPORT_CARD - Original Micro Support Card made by PFC.
- *  CONFIG_DCC_MICRO_SUPPORT_CARD - DCC version Micro Support Card.
- *                       CPLD is re-programmed for ARIMA board compatibility.
- *  No define                     - No support card.
- */
-
-#if 0
-#define CONFIG_PFC_MICRO_SUPPORT_CARD
-#else
-#define CONFIG_DCC_MICRO_SUPPORT_CARD
-#endif
-
 /*
  * Serial Configuration
  *   SoC UART     : enable CONFIG_UNIPHIER_SERIAL

diff --git a/include/configs/ph1_pro4.h b/include/configs/ph1_pro4.h
index 778003071e51d6270a4feaba21d0f769cae22404..15849ba2bd811b6660c12b603d57716c93b378c8 100644 (file)
--- a/include/configs/ph1_pro4.h
+++ b/include/configs/ph1_pro4.h
@@ -8,21 +8,6 @@
 #ifndef __PH1_XXX_H
 #define __PH1_XXX_H
 
-/*
- * Support Card Select
- *
- *  CONFIG_PFC_MICRO_SUPPORT_CARD - Original Micro Support Card made by PFC.
- *  CONFIG_DCC_MICRO_SUPPORT_CARD - DCC version Micro Support Card.
- *                       CPLD is re-programmed for ARIMA board compatibility.
- *  No define                     - No support card.
- */
-
-#if 0
-#define CONFIG_PFC_MICRO_SUPPORT_CARD
-#else
-#define CONFIG_DCC_MICRO_SUPPORT_CARD
-#endif
-
 /*
  * Serial Configuration
  *   SoC UART     : enable CONFIG_UNIPHIER_SERIAL

diff --git a/include/configs/ph1_sld8.h b/include/configs/ph1_sld8.h
index e2f1102003d20a7cb4e0ccaeeab348ce82c7d087..e64d902cf64696ac5166dbc1caa762c2ac436961 100644 (file)
--- a/include/configs/ph1_sld8.h
+++ b/include/configs/ph1_sld8.h
@@ -8,21 +8,6 @@
 #ifndef __PH1_XXX_H
 #define __PH1_XXX_H
 
-/*
- * Support Card Select
- *
- *  CONFIG_PFC_MICRO_SUPPORT_CARD - Original Micro Support Card made by PFC.
- *  CONFIG_DCC_MICRO_SUPPORT_CARD - DCC version Micro Support Card.
- *                       CPLD is re-programmed for ARIMA board compatibility.
- *  No define                     - No support card.
- */
-
-#if 0
-#define CONFIG_PFC_MICRO_SUPPORT_CARD
-#else
-#define CONFIG_DCC_MICRO_SUPPORT_CARD
-#endif
-
 /*
  * Serial Configuration
  *   SoC UART     : enable CONFIG_UNIPHIER_SERIAL

diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h
index 31ab4708eb68cc7bbc626fac0e4151983a07a8bb..224c3354b8ac243beacbc1f3682ce02e7336655b 100644 (file)
--- a/include/configs/uniphier-common.h
+++ b/include/configs/uniphier-common.h
@@ -10,12 +10,6 @@
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
-#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD) &&  \
-                               defined(CONFIG_DCC_MICRO_SUPPORT_CARD)
-# error "Both CONFIG_PFC_MICRO_SUPPORT_CARD and CONFIG_DCC_MICRO_SUPPORT_CARD \
-are defined. Select only one of them."
-#endif
-
 /*
  * Support card address map
  */