Convert CONFIG_CONS_SCIF0 et al to Kconfig

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@konsulko.com>

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 76171e7146a7cf7baf1ae8d593da3d46aaae2429..af01e506d54cf4cac3226c221fe788032c130c94 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -804,6 +804,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 SEMIHOSTING_SERIAL
        bool "Semihosting UART support"
        depends on SEMIHOSTING && !SERIAL_RX_BUFFER

diff --git a/include/configs/alt.h b/include/configs/alt.h
index acc416de06bd03262a59aee933cc4089d36b992e..1656072ebb4d0b26d49afdcad6b1fc08129b17dc 100644 (file)
--- 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 18e1e401ae6890c92ecc3122d75d5404a6a6ffea..f144302a71d23e3397acd0d61ee4c2f1bd015da2 100644 (file)
--- 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 dfa139dc7dc1d0ed381e3ab2c8a281b3692a170c..9015cabc2d17cfa017041f4635ae5005ea06c0c7 100644 (file)
--- 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 84603e354020de3e565dcf75d5ba9224a0155837..3fef4150b25c796e5ecd8b52579377c2cd1b9b16 100644 (file)
--- 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 c20ef5f69685c727e9cf86ddbe1897cb515dae14..f35549d95acb8b9b43b92908d6b0ffd903a3a7ed 100644 (file)
--- 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 8cabad2853c9fbc1ffc0568fc1f16ea85170698a..df3b4bbce0722766caf40e1fb5662e88a85906f5 100644 (file)
--- 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 661b7ea0cd2ab6a0996dc7c2ea74867e7b40dd6b..964ce7def64bb18fbe9a6b57835439d6e153cfc5 100644 (file)
--- 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 869f9f52ae116c426681edf7ed17b88bce3cb27e..54674094e83bc7e22a7f51f96fc6542eaa58b863 100644 (file)
--- 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 c3759ed19bf0356ea8363729c6503a372d428cab..5bb6bf3d78225bc17b79b5b4e6ecf24a78ea078e 100644 (file)
--- 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 fa195c62d56c1b79cad4a87e3e87aa1a13172d9b..ec8740b3826d7cdaa64f98a2aee11e5f937cc000 100644 (file)
--- 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 f9574be3f77615e968614450df053fb6462200b2..4ddbea5b1d061eee975184b44183a52a4d677503 100644 (file)
--- 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