summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-06 00:03:21 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-08 01:25:44 +0900
commit3201455d6ad5b6e1f316e89d998c2c31c852b224 (patch)
tree586560171bebf7808d4a0055a169cc8396ecc412 /include
parent84b3584f21558098fc724e05341aee2e95b0c1f3 (diff)
downloadblackbird-obmc-uboot-3201455d6ad5b6e1f316e89d998c2c31c852b224.tar.gz
blackbird-obmc-uboot-3201455d6ad5b6e1f316e89d998c2c31c852b224.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/ph1_ld4.h15
-rw-r--r--include/configs/ph1_pro4.h15
-rw-r--r--include/configs/ph1_sld8.h15
-rw-r--r--include/configs/uniphier-common.h6
4 files changed, 0 insertions, 51 deletions
diff --git a/include/configs/ph1_ld4.h b/include/configs/ph1_ld4.h
index 73a95e615e..a3e4f96e02 100644
--- a/include/configs/ph1_ld4.h
+++ b/include/configs/ph1_ld4.h
@@ -9,21 +9,6 @@
#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
* On-board UART: enable CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/ph1_pro4.h b/include/configs/ph1_pro4.h
index 778003071e..15849ba2bd 100644
--- a/include/configs/ph1_pro4.h
+++ b/include/configs/ph1_pro4.h
@@ -9,21 +9,6 @@
#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
* On-board UART: enable CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/ph1_sld8.h b/include/configs/ph1_sld8.h
index e2f1102003..e64d902cf6 100644
--- a/include/configs/ph1_sld8.h
+++ b/include/configs/ph1_sld8.h
@@ -9,21 +9,6 @@
#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
* On-board UART: enable CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h
index 31ab4708eb..224c3354b8 100644
--- 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
*/
OpenPOWER on IntegriCloud