serial: pxa: Make use of default_serial_console in serial_pxa

Make use of the newly implemented weak default_serial_console in
the serial_pxa driver. This removes all reimplementations of this
function from board files.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>

diff --git a/board/balloon3/balloon3.c b/board/balloon3/balloon3.c
index f360323c9b715d47cfdc8bbd601bdb5d43b0a11a..c934988cc286e5f21cbd4b20e13f40fad0a6f095 100644 (file)
--- a/board/balloon3/balloon3.c
+++ b/board/balloon3/balloon3.c
@@ -53,11 +53,6 @@ int board_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console(void)
-{
-       return &serial_stuart_device;
-}
-
 int dram_init(void)
 {
        pxa2xx_dram_init();

diff --git a/board/palmld/palmld.c b/board/palmld/palmld.c
index 2f1ad200808a1bd440602ed5b2c3dd72fbc47a68..57b4f5f62326ec0cae92c8b54df9ef1487d45b2d 100644 (file)
--- a/board/palmld/palmld.c
+++ b/board/palmld/palmld.c
@@ -52,11 +52,6 @@ int board_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console(void)
-{
-       return &serial_ffuart_device;
-}
-
 int dram_init(void)
 {
        pxa2xx_dram_init();

diff --git a/board/palmtc/palmtc.c b/board/palmtc/palmtc.c
index 4adf152a4edc02e78863ca44d35641249aff1666..b23eec805e77afc0b6ecaeb4ef6e0bd5a5d4e8d1 100644 (file)
--- a/board/palmtc/palmtc.c
+++ b/board/palmtc/palmtc.c
@@ -51,11 +51,6 @@ int board_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console(void)
-{
-       return &serial_ffuart_device;
-}
-
 int dram_init(void)
 {
        pxa2xx_dram_init();

diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index d72e5d6b5a09d68c715fa5b35c031ddf7974360e..a6e13c8b2c6875a54e4eb556897567cc428ad2e8 100644 (file)
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -29,11 +29,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-struct serial_device *default_serial_console(void)
-{
-       return &serial_ffuart_device;
-}
-
 int board_init(void)
 {
        /* We have RAM, disable cache */

diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 129119528fe960215cd8a9acd6055a3558b2d395..8fc3c40e6b4459edc455f9565651dfe27b787624 100644 (file)
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -135,11 +135,6 @@ int board_late_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console (void)
-{
-       return &serial_ffuart_device;
-}
-
 int dram_init(void)
 {
        pxa2xx_dram_init();

diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c
index dfdab9b6f683fc55df0292378483849f3aa663c1..26635341e2b26a53ab6b99471fa8bf86f3529814 100644 (file)
--- a/board/vpac270/vpac270.c
+++ b/board/vpac270/vpac270.c
@@ -50,11 +50,6 @@ int board_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console(void)
-{
-       return &serial_ffuart_device;
-}
-
 int dram_init(void)
 {
 #ifndef        CONFIG_ONENAND

diff --git a/board/zipitz2/zipitz2.c b/board/zipitz2/zipitz2.c
index 82dfa82688a610dfdcd884fd111d8d8921950837..579841d1a9ce7e8eb3748473da0cf6a498eb044b 100644 (file)
--- a/board/zipitz2/zipitz2.c
+++ b/board/zipitz2/zipitz2.c
@@ -62,11 +62,6 @@ int board_init (void)
        return 0;
 }
 
-struct serial_device *default_serial_console (void)
-{
-       return &serial_stuart_device;
-}
-
 int dram_init(void)
 {
        pxa2xx_dram_init();

diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 756f40956b1645e26912397031b11fad1fd9f4ad..0f26a5b30c04cb55ddb29b14747c7296681caecb 100644 (file)
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -53,6 +53,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
+#define CONFIG_CONS_INDEX              2
 #define        CONFIG_BAUDRATE                 115200
 
 /*

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index ae84344e47d669bce86d22785e936f6983f2a34c..bb8bea719dcfa97576a2aac6db2e8d6e491d5474 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -55,6 +55,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
+#define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 115200
 
 /*

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 0a1d1e09a66bc4ce07275d577fe6d1c3f61e0c95..ed64960879b0ead9add0102d8d2264596616a50c 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -64,6 +64,7 @@
  */
 #define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART on LUBBOCK */
+#define CONFIG_CONS_INDEX      3
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 835121ed3bddd1210616f55f072fb29385dfd261..c5dd494059e2ff922b300cf4e07169b1bc782735 100644 (file)
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -54,6 +54,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
+#define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 9600
 
 /*

diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index bc88354c4a002cd877aa6ec5e1212c8ebafa270b..6e8d8e9d573398b2a25ef08475ef8e94f6db37da 100644 (file)
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -58,6 +58,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
+#define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 115200
 
 /*

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index ce9e7d115d8af6f17018fc3c0bda0745d3933257..24c53633f065ce176ec1d2ad0809fc1f8e10176e 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -99,6 +99,7 @@
  */
 #define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART on LUBBOCK */
+#define CONFIG_CONS_INDEX      3
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 151059a939098c666067832796624e6c1f12eb4c..47c6a232d2844fb3d5aec25b218b3cd4d8f470a0 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -68,6 +68,7 @@
 #define CONFIG_FFUART         1       /* we use FFUART on Conxs */
 #define CONFIG_BTUART         1       /* we use BTUART on Conxs */
 #define CONFIG_STUART         1       /* we use STUART on Conxs */
+#define CONFIG_CONS_INDEX      3
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 424a90245634e947e2d6495660b044b07a7bbb60..5e948f94ad29f257f23b1d2439652315bbf16dba 100644 (file)
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -75,6 +75,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
+#define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 115200
 
 /*

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index e399e95019a0c9cea03bbef05a62b5629341963a..eee2547a374265b208f6a0faf949453056256be1 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -54,7 +54,7 @@
  */
 #define CONFIG_PXA_SERIAL
 #define CONFIG_BTUART         1       /* we use BTUART on XAENIAX */
-
+#define CONFIG_CONS_INDEX      4
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 8b7e05b9e51fe7597ec7f1ce9af891d0f1f6b538..bf6394a90ae90d6cff7bcb8c53008dc71ca50847 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -66,6 +66,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
+#define CONFIG_CONS_INDEX              2
 #define        CONFIG_BAUDRATE                 115200
 
 /*