[PATCH 11/25] Convert CONFIG_CONS_SCIF0 et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_CONS_SCIF0
   CONFIG_CONS_SCIF1
   CONFIG_CONS_SCIF2
   CONFIG_CONS_SCIF4
   CONFIG_CONS_SCIFA0

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/serial/Kconfig             | 21 +++++++++++++++++++++
 include/configs/alt.h              |  1 -
 include/configs/armadillo-800eva.h |  1 -
 include/configs/gose.h             |  1 -
 include/configs/koelsch.h          |  1 -
 include/configs/kzm9g.h            |  1 -
 include/configs/lager.h            |  1 -
 include/configs/porter.h           |  1 -
 include/configs/r2dplus.h          |  1 -
 include/configs/rcar-gen3-common.h |  1 -
 include/configs/silk.h             |  1 -
 include/configs/stout.h            |  1 -
 12 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 610f8062c76b..f52422504b03 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -782,6 +782,27 @@ config SCIF_CONSOLE
 	  on systems with RCar or SH SoCs, say Y to this option. If unsure,
 	  say N.
 
+choice
+	prompt "SCIF console port"
+	depends on SCIF_CONSOLE && (!DM_SERIAL || (SPL && !SPL_DM_SERIAL))
+
+config CONS_SCIF0
+	bool "SCIF0"
+
+config CONS_SCIF1
+	bool "SCIF1"
+
+config CONS_SCIF2
+	bool "SCIF2"
+
+config CONS_SCIF4
+	bool "SCIF4"
+
+config CONS_SCIFA0
+	bool "SCIFA0"
+
+endchoice
+
 config UNIPHIER_SERIAL
 	bool "Support for UniPhier on-chip UART"
 	depends on ARCH_UNIPHIER
diff --git a/include/configs/alt.h b/include/configs/alt.h
index acc416de06bd..1656072ebb4d 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -42,7 +42,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF2
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 18e1e401ae68..f144302a71d2 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
-#define CONFIG_CONS_SCIF1
 #define SCIF0_BASE		0xe6c40000
 #define SCIF1_BASE		0xe6c50000
 #define SCIF2_BASE		0xe6c60000
diff --git a/include/configs/gose.h b/include/configs/gose.h
index dfa139dc7dc1..9015cabc2d17 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -37,7 +37,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF0
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 84603e354020..3fef4150b25c 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -37,7 +37,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF0
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index c20ef5f69685..f35549d95acb 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
-#define CONFIG_CONS_SCIF4
 
 #undef  CONFIG_SYS_LOADS_BAUD_CHANGE
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 8cabad2853c9..df3b4bbce072 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -38,7 +38,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF0
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 661b7ea0cd2a..964ce7def64b 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -42,7 +42,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF0
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 869f9f52ae11..54674094e83b 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -4,7 +4,6 @@
 #define __LITTLE_ENDIAN__	1
 
 /* SCIF */
-#define CONFIG_CONS_SCIF1	1
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE		0x8C000000
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index c3759ed19bf0..5bb6bf3d7822 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -60,7 +60,6 @@
 #define CONFIG_SPL_STACK		0xe6304000
 #define CONFIG_SPL_MAX_SIZE		0x7000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF2
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/silk.h b/include/configs/silk.h
index fa195c62d56c..ec8740b3826d 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -42,7 +42,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIF2
 #define CONFIG_SH_SCIF_CLK_FREQ		65000000
 #endif
 
diff --git a/include/configs/stout.h b/include/configs/stout.h
index f9574be3f776..4ddbea5b1d06 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -46,7 +46,6 @@
 #define CONFIG_SPL_STACK		0xe6340000
 #define CONFIG_SPL_MAX_SIZE		0x4000
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_CONS_SCIFA0
 #define CONFIG_SH_SCIF_CLK_FREQ		52000000
 #endif
 
-- 
2.25.1