From ce6971cdd81b8c16aad2cceaf1cd923a34cd096a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 12 Sep 2012 12:36:25 +0200 Subject: [PATCH] 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 Cc: Marek Vasut Cc: Tom Rini --- 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 f360323c9b..c934988cc2 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 2f1ad20080..57b4f5f623 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 4adf152a4e..b23eec805e 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 d72e5d6b5a..a6e13c8b2c 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 129119528f..8fc3c40e6b 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 dfdab9b6f6..26635341e2 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 82dfa82688..579841d1a9 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 756f40956b..0f26a5b30c 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 ae84344e47..bb8bea719d 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 0a1d1e09a6..ed64960879 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 835121ed3b..c5dd494059 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 bc88354c4a..6e8d8e9d57 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 ce9e7d115d..24c53633f0 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 151059a939..47c6a232d2 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 424a902456..5e948f94ad 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 e399e95019..eee2547a37 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 8b7e05b9e5..bf6394a90a 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 /*