[U-Boot] [PATCH 05/71] serial: pxa: Make use of default_serial_console in serial_pxa

Marek Vasut
2012-09-16T23:20:30Z

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>
---
board/balloon3/balloon3.c | 5 -----
board/palmld/palmld.c | 5 -----
board/palmtc/palmtc.c | 5 -----
board/toradex/colibri_pxa270/colibri_pxa270.c | 5 -----
board/trizepsiv/conxs.c | 5 -----
board/vpac270/vpac270.c | 5 -----
board/zipitz2/zipitz2.c | 5 -----
include/configs/balloon3.h | 1 +
include/configs/colibri_pxa270.h | 1 +
include/configs/lubbock.h | 1 +
include/configs/palmld.h | 1 +
include/configs/palmtc.h | 1 +
include/configs/pxa255_idp.h | 1 +
include/configs/trizepsiv.h | 1 +
include/configs/vpac270.h | 1 +
include/configs/xaeniax.h | 2 +-
include/configs/zipitz2.h | 1 +
17 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/board/balloon3/balloon3.c b/board/balloon3/balloon3.c
index f360323..c934988 100644
--- 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 2f1ad20..57b4f5f 100644
--- 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 4adf152..b23eec8 100644
--- 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 d72e5d6..a6e13c8 100644
--- 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 1291195..8fc3c40 100644
--- 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 dfdab9b..2663534 100644
--- 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 82dfa82..579841d 100644
--- 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 756f409..0f26a5b 100644
--- 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 ae84344..bb8bea7 100644
--- 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 0a1d1e0..ed64960 100644
--- 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 835121e..c5dd494 100644
--- 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 bc88354..6e8d8e9 100644
--- 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 ce9e7d1..24c5363 100644
--- 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 151059a..47c6a23 100644
--- 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 424a902..5e948f9 100644
--- 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 e399e95..eee2547 100644
--- 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 8b7e05b..bf6394a 100644
--- 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

/*
--
1.7.10.4