summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-10-23 22:26:11 +0900
committerSimon Glass <sjg@chromium.org>2014-10-23 21:43:09 -0600
commitff247b7a0d2f4051786f5be1e73cf90a86b4b641 (patch)
treed0b94aacbba0d4074d49df2f64c0a9c54e160a71
parentd064cbffff37367b64b53f6e6942cbea67109237 (diff)
downloadtalos-obmc-uboot-ff247b7a0d2f4051786f5be1e73cf90a86b4b641.tar.gz
talos-obmc-uboot-ff247b7a0d2f4051786f5be1e73cf90a86b4b641.zip
serial: uniphier: move CONFIG_UNIPHIER_SERIAL to Kconfig
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/ph1_ld4_defconfig1
-rw-r--r--configs/ph1_pro4_defconfig1
-rw-r--r--configs/ph1_sld8_defconfig1
-rw-r--r--drivers/serial/Kconfig6
-rw-r--r--include/configs/ph1_ld4.h4
-rw-r--r--include/configs/ph1_pro4.h4
-rw-r--r--include/configs/ph1_sld8.h4
7 files changed, 12 insertions, 9 deletions
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index c8404f8a8e..e6aba422f8 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -7,4 +7,5 @@ CONFIG_NAND_DENALI=y
CONFIG_SYS_NAND_DENALI_64BIT=y
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
CONFIG_DM_SERIAL=y
+CONFIG_UNIPHIER_SERIAL=y
S:CONFIG_SPL_NAND_DENALI=y
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 5c051e36a0..334ec4bbdf 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -7,4 +7,5 @@ CONFIG_NAND_DENALI=y
CONFIG_SYS_NAND_DENALI_64BIT=y
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
CONFIG_DM_SERIAL=y
+CONFIG_UNIPHIER_SERIAL=y
S:CONFIG_SPL_NAND_DENALI=y
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 2c636e60d1..4e8f354c9b 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -7,4 +7,5 @@ CONFIG_NAND_DENALI=y
CONFIG_SYS_NAND_DENALI_64BIT=y
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
CONFIG_DM_SERIAL=y
+CONFIG_UNIPHIER_SERIAL=y
S:CONFIG_SPL_NAND_DENALI=y
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 6a392ba24f..a0b6e02b54 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -4,3 +4,9 @@ config DM_SERIAL
help
If you want to use driver model for serial drivers, say Y.
To use legacy serial drivers, say N.
+
+config UNIPHIER_SERIAL
+ bool "UniPhier on-chip UART support"
+ depends on ARCH_UNIPHIER && DM_SERIAL
+ help
+ Support for the on-chip UARTs on the Panasonic UniPhier platform.
diff --git a/include/configs/ph1_ld4.h b/include/configs/ph1_ld4.h
index a546865937..005a853f56 100644
--- a/include/configs/ph1_ld4.h
+++ b/include/configs/ph1_ld4.h
@@ -28,9 +28,7 @@
* SoC UART : enable CONFIG_UNIPHIER_SERIAL
* On-board UART: enable CONFIG_SYS_NS16550_SERIAL
*/
-#if 1
-#define CONFIG_UNIPHIER_SERIAL
-#else
+#if 0
#define CONFIG_SYS_NS16550_SERIAL
#endif
diff --git a/include/configs/ph1_pro4.h b/include/configs/ph1_pro4.h
index 85c14ba6cd..7dd6fd2a92 100644
--- a/include/configs/ph1_pro4.h
+++ b/include/configs/ph1_pro4.h
@@ -28,9 +28,7 @@
* SoC UART : enable CONFIG_UNIPHIER_SERIAL
* On-board UART: enable CONFIG_SYS_NS16550_SERIAL
*/
-#if 1
-#define CONFIG_UNIPHIER_SERIAL
-#else
+#if 0
#define CONFIG_SYS_NS16550_SERIAL
#endif
diff --git a/include/configs/ph1_sld8.h b/include/configs/ph1_sld8.h
index 41e2299bee..1062aace38 100644
--- a/include/configs/ph1_sld8.h
+++ b/include/configs/ph1_sld8.h
@@ -28,9 +28,7 @@
* SoC UART : enable CONFIG_UNIPHIER_SERIAL
* On-board UART: enable CONFIG_SYS_NS16550_SERIAL
*/
-#if 1
-#define CONFIG_UNIPHIER_SERIAL
-#else
+#if 0
#define CONFIG_SYS_NS16550_SERIAL
#endif
OpenPOWER on IntegriCloud