Rename .init() to .start() and .uninit() to .stop() in struct serial_device. This allows aligning struct serial_device with closer to struct stdio_dev. The real goal here is to allow these two structures to converge together and eventually make one to be a superset of the other.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com --- arch/blackfin/cpu/serial.c | 4 ++-- common/serial.c | 16 ++++++++-------- include/serial.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/blackfin/cpu/serial.c b/arch/blackfin/cpu/serial.c index 6603dc0..33677ba 100644 --- a/arch/blackfin/cpu/serial.c +++ b/arch/blackfin/cpu/serial.c @@ -236,8 +236,8 @@ static void uart##n##_loop(int state) \ \ struct serial_device bfin_serial##n##_device = { \ .name = "bfin_uart"#n, \ - .init = uart##n##_init, \ - .uninit = uart##n##_uninit, \ + .start = uart##n##_init, \ + .stop = uart##n##_uninit, \ .setbrg = uart##n##_setbrg, \ .getc = uart##n##_getc, \ .tstc = uart##n##_tstc, \ diff --git a/common/serial.c b/common/serial.c index 75cc1bb..5740d4f 100644 --- a/common/serial.c +++ b/common/serial.c @@ -35,7 +35,7 @@ static struct serial_device *serial_current; void serial_register(struct serial_device *dev) { #ifdef CONFIG_NEEDS_MANUAL_RELOC - dev->init += gd->reloc_off; + dev->start += gd->reloc_off; dev->setbrg += gd->reloc_off; dev->getc += gd->reloc_off; dev->tstc += gd->reloc_off; @@ -136,8 +136,8 @@ void serial_stdio_init(void) strcpy(dev.name, s->name); dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;

- dev.start = s->init; - dev.stop = s->uninit; + dev.start = s->start; + dev.stop = s->stop; dev.putc = s->putc; dev.puts = s->puts; dev.getc = s->getc; @@ -168,7 +168,7 @@ void serial_reinit_all(void) struct serial_device *s;

for (s = serial_devices; s; s = s->next) - s->init(); + s->start(); }

static struct serial_device *get_current(void) @@ -188,7 +188,7 @@ static struct serial_device *get_current(void)

int serial_init(void) { - return get_current()->init(); + return get_current()->start(); }

void serial_setbrg(void) @@ -288,9 +288,9 @@ int uart_post_test(int flags) /* Disable loop back */ s->loop(0);

- /* XXX: There is no serial_uninit() !? */ - if (s->uninit) - s->uninit(); + /* XXX: There is no serial_stop() !? */ + if (s->stop) + s->stop(); }

done: diff --git a/include/serial.h b/include/serial.h index 8433ed7..eb1388c 100644 --- a/include/serial.h +++ b/include/serial.h @@ -7,8 +7,8 @@ struct serial_device { /* enough bytes to match alignment of following func pointer */ char name[16];

- int (*init)(void); - int (*uninit)(void); + int (*start)(void); + int (*stop)(void); void (*setbrg)(void); int (*getc)(void); int (*tstc)(void);

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

/*

Some of the boards using the mpc512x serial driver didn't properly define which PSC console to use. This caused breakage when building with CONFIG_SERIAL_MULTI enabled. Fix this by defining the default PSC console.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- include/configs/aria.h | 1 + include/configs/mecp5123.h | 1 + include/configs/mpc5121ads.h | 1 + 3 files changed, 3 insertions(+)

diff --git a/include/configs/aria.h b/include/configs/aria.h index b21b495..0b31c50 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -322,6 +322,7 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 3 /* console on PSC3 */ +#define CONFIG_SYS_PSC3 #if CONFIG_PSC_CONSOLE != 3 #error CONFIG_PSC_CONSOLE must be 3 #endif diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index b41bda9..cafc273 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -222,6 +222,7 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 3 /* console is on PSC3 */ +#define CONFIG_SYS_PSC3 #if CONFIG_PSC_CONSOLE != 3 #error CONFIG_PSC_CONSOLE must be 3 #endif diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 9d1327f..3f55d35 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -290,6 +290,7 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 3 /* console is on PSC3 */ +#define CONFIG_SYS_PSC3 #if CONFIG_PSC_CONSOLE != 3 #error CONFIG_PSC_CONSOLE must be 3 #endif

Move the registration of serial_smc and serial_scc ports from default serial_initialize() into CPU specific function called from serial_initialize(). This slims down the serial_initialize() call to a bare tracker of all possible serial port registration routines in U-Boot.

The exports of both serial_scc_device and serial_smc_device can not yet be removed as they are still used in default_serial_console() calls.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de Cc: Mike Frysinger vapier@gentoo.org --- arch/powerpc/cpu/mpc8xx/serial.c | 11 +++++++++++ common/serial.c | 11 +++-------- 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c index dc9b323..00888e9 100644 --- a/arch/powerpc/cpu/mpc8xx/serial.c +++ b/arch/powerpc/cpu/mpc8xx/serial.c @@ -681,6 +681,17 @@ __weak struct serial_device *default_serial_console(void) #endif }

+void mpc8xx_serial_initialize(void) +{ +#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) + serial_register(&serial_smc_device); +#endif +#if defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) || \ + defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) + serial_register(&serial_scc_device); +#endif +} + #ifdef CONFIG_MODEM_SUPPORT void disable_putc(void) { diff --git a/common/serial.c b/common/serial.c index 84dbe50..0187dac 100644 --- a/common/serial.c +++ b/common/serial.c @@ -40,6 +40,8 @@ static void serial_null(void) void name(void) \ __attribute__((weak, alias("serial_null")));

+serial_initfunc(mpc8xx_serial_initialize); + void serial_register(struct serial_device *dev) { #ifdef CONFIG_NEEDS_MANUAL_RELOC @@ -57,14 +59,7 @@ void serial_register(struct serial_device *dev)

void serial_initialize(void) { -#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) - serial_register(&serial_smc_device); -#endif -#if defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) || \ - defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) - serial_register(&serial_scc_device); -#endif - + mpc8xx_serial_initialize(); #if defined(CONFIG_SYS_NS16550_SERIAL) #if defined(CONFIG_SYS_NS16550_COM1) serial_register(&eserial1_device);

Move the registration of serial_XXuart ports from default serial_initialize() into driver specific function called from serial_initialize(). This slims down the serial_initialize() call to a bare tracker of all possible serial port registration routines in U-Boot.

The newly implemented pxa_serial_initialize() function, which is implemented inside of the serial_pxa driver allows encapsulation of serial_XXuart within the serial_pxa driver itself.

Also, remove the exports of serial_XXuart from include/serial.h as they are no longer needed. This is simply because the implementation of default_serial_console() is wrapped into the serial_pxa driver and the default console is picked by CONFIG_CONS_IDX macro in config file.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com --- common/serial.c | 11 ++--------- drivers/serial/serial_pxa.c | 13 +++++++++++++ include/serial.h | 4 ---- 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/common/serial.c b/common/serial.c index b210b05..d457d23 100644 --- a/common/serial.c +++ b/common/serial.c @@ -41,6 +41,7 @@ static void serial_null(void) __attribute__((weak, alias("serial_null")));

serial_initfunc(mpc8xx_serial_initialize); +serial_initfunc(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize);

void serial_register(struct serial_device *dev) @@ -75,15 +76,7 @@ void serial_initialize(void) serial_register(&eserial4_device); #endif #endif /* CONFIG_SYS_NS16550_SERIAL */ -#if defined(CONFIG_FFUART) - serial_register(&serial_ffuart_device); -#endif -#if defined(CONFIG_BTUART) - serial_register(&serial_btuart_device); -#endif -#if defined(CONFIG_STUART) - serial_register(&serial_stuart_device); -#endif + pxa_serial_initialize(); s3c24xx_serial_initialize(); #if defined(CONFIG_S5P) serial_register(&s5p_serial0_device); diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index bd3b3cf..46d7689 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -314,4 +314,17 @@ __weak struct serial_device *default_serial_console(void) #error "Bad CONFIG_CONS_INDEX." #endif } + +void pxa_serial_initialize(void) +{ +#if defined(CONFIG_FFUART) + serial_register(&serial_ffuart_device); +#endif +#if defined(CONFIG_BTUART) + serial_register(&serial_btuart_device); +#endif +#if defined(CONFIG_STUART) + serial_register(&serial_stuart_device); +#endif +} #endif diff --git a/include/serial.h b/include/serial.h index aec6506..c64bb04 100644 --- a/include/serial.h +++ b/include/serial.h @@ -70,10 +70,6 @@ extern struct serial_device zoom2_serial_device2; extern struct serial_device zoom2_serial_device3; #endif

-extern struct serial_device serial_ffuart_device; -extern struct serial_device serial_btuart_device; -extern struct serial_device serial_stuart_device; - #if defined(CONFIG_SYS_BFIN_UART) extern void serial_register_bfin_uart(void); extern struct serial_device bfin_serial0_device;

Move the registration of eserialN_device ports from default serial_initialize() into driver specific function called from serial_initialize(). This slims down the serial_initialize() call to a bare tracker of all possible serial port registration routines in U-Boot.

The newly implemented ns16550_serial_initialize() function, which is implemented inside of the ns16550 serial driver allows encapsulation of eserialN_device within the ns16550 serial driver itself.

Also, remove the exports of eserialN_device from include/serial.h as they are no longer needed. This is simply because the implementation of default_serial_console() is wrapped into the ns16550 serial driver and the default console is picked by CONFIG_SERIAL<N> macro in config file.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de Cc: Mike Frysinger vapier@gentoo.org Cc: Michal Simek monstr@monstr.eu --- common/serial.c | 16 ++-------------- drivers/serial/serial.c | 16 ++++++++++++++++ include/serial.h | 8 ++------ 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 08c6e2a..faad804 100644 --- a/common/serial.c +++ b/common/serial.c @@ -41,6 +41,7 @@ static void serial_null(void) __attribute__((weak, alias("serial_null")));

serial_initfunc(mpc8xx_serial_initialize); +serial_initfunc(ns16550_serial_initialize); serial_initfunc(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize); serial_initfunc(s5p_serial_initialize); @@ -65,20 +66,7 @@ void serial_register(struct serial_device *dev) void serial_initialize(void) { mpc8xx_serial_initialize(); -#if defined(CONFIG_SYS_NS16550_SERIAL) -#if defined(CONFIG_SYS_NS16550_COM1) - serial_register(&eserial1_device); -#endif -#if defined(CONFIG_SYS_NS16550_COM2) - serial_register(&eserial2_device); -#endif -#if defined(CONFIG_SYS_NS16550_COM3) - serial_register(&eserial3_device); -#endif -#if defined(CONFIG_SYS_NS16550_COM4) - serial_register(&eserial4_device); -#endif -#endif /* CONFIG_SYS_NS16550_SERIAL */ + ns16550_serial_initialize(); pxa_serial_initialize(); s3c24xx_serial_initialize(); s5p_serial_initialize(); diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 9d92dee..00ad97c 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -340,4 +340,20 @@ __weak struct serial_device *default_serial_console(void) #endif }

+void ns16550_serial_initialize(void) +{ +#if defined(CONFIG_SYS_NS16550_COM1) + serial_register(&eserial1_device); +#endif +#if defined(CONFIG_SYS_NS16550_COM2) + serial_register(&eserial2_device); +#endif +#if defined(CONFIG_SYS_NS16550_COM3) + serial_register(&eserial3_device); +#endif +#if defined(CONFIG_SYS_NS16550_COM4) + serial_register(&eserial4_device); +#endif +} + #endif /* CONFIG_SERIAL_MULTI */ diff --git a/include/serial.h b/include/serial.h index 497f49a..6a42904 100644 --- a/include/serial.h +++ b/include/serial.h @@ -33,14 +33,10 @@ extern struct serial_device *default_serial_console(void); defined(CONFIG_TEGRA20) || defined(CONFIG_SYS_COREBOOT) extern struct serial_device serial0_device; extern struct serial_device serial1_device; -#if defined(CONFIG_SYS_NS16550_SERIAL) +#endif + extern struct serial_device eserial1_device; extern struct serial_device eserial2_device; -extern struct serial_device eserial3_device; -extern struct serial_device eserial4_device; -#endif /* CONFIG_SYS_NS16550_SERIAL */ - -#endif

#if defined(CONFIG_OMAP3_ZOOM2) extern struct serial_device zoom2_serial_device0;

Rename the serial_register_bfin_uart() to bfin_initialize_serial() to be consistent with the rest of the naming. Next, remove it's prototype from serial.h and properly insert it into serial.c as the rest of the serial initialization functions.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Mike Frysinger vapier@gentoo.org --- arch/blackfin/cpu/serial.c | 2 +- common/serial.c | 5 ++--- include/serial.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/blackfin/cpu/serial.c b/arch/blackfin/cpu/serial.c index 33677ba..64340ec 100644 --- a/arch/blackfin/cpu/serial.c +++ b/arch/blackfin/cpu/serial.c @@ -272,7 +272,7 @@ __weak struct serial_device *default_serial_console(void) #endif }

-void serial_register_bfin_uart(void) +void bfin_serial_initialize(void) { #ifdef UART0_DLL serial_register(&bfin_serial0_device); diff --git a/common/serial.c b/common/serial.c index faad804..0a43c1b 100644 --- a/common/serial.c +++ b/common/serial.c @@ -45,6 +45,7 @@ serial_initfunc(ns16550_serial_initialize); serial_initfunc(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize); serial_initfunc(s5p_serial_initialize); +serial_initfunc(bfin_serial_initialize); serial_initfunc(mpc512x_serial_initialize); serial_initfunc(uartlite_serial_initialize);

@@ -71,9 +72,7 @@ void serial_initialize(void) s3c24xx_serial_initialize(); s5p_serial_initialize(); mpc512x_serial_initialize(); -#if defined(CONFIG_SYS_BFIN_UART) - serial_register_bfin_uart(); -#endif + bfin_serial_initialize(); uartlite_serial_initialize(); serial_assign(default_serial_console()->name); } diff --git a/include/serial.h b/include/serial.h index b405792..e65dd26 100644 --- a/include/serial.h +++ b/include/serial.h @@ -45,10 +45,6 @@ extern struct serial_device zoom2_serial_device2; extern struct serial_device zoom2_serial_device3; #endif

-#if defined(CONFIG_SYS_BFIN_UART) -extern void serial_register_bfin_uart(void); -#endif - extern void serial_register(struct serial_device *); extern void serial_initialize(void); extern void serial_stdio_init(void);

Rework the emulation of serial console via JTAG from simple ad-hoc implementation of serial port routines to CONFIG_SERIAL_MULTI and enable CONFIG_SERIAL_MULTI unconditionally for blackfin.

In order for the JTAG serial console to take precedence over all other serial ports available in system, implement override for default_serial_console call returning this JTAG serial console.

This brings in a bit of a growth of size, but eventually will allow us to unconditionally enable CONFIG_SERIAL_MULTI throughout the whole U-Boot and maintain only one serial subsystem.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Mike Frysinger vapier@gentoo.org --- arch/blackfin/cpu/jtag-console.c | 37 ++++++++++++++++++++++++++++++------- common/serial.c | 2 ++ include/configs/bfin_adi_common.h | 2 +- 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/arch/blackfin/cpu/jtag-console.c b/arch/blackfin/cpu/jtag-console.c index a77358a..7cddb85 100644 --- a/arch/blackfin/cpu/jtag-console.c +++ b/arch/blackfin/cpu/jtag-console.c @@ -194,12 +194,35 @@ int drv_jtag_console_init(void) }

#ifdef CONFIG_UART_CONSOLE_IS_JTAG +#include <serial.h> /* Since the JTAG is always available (at power on), allow it to fake a UART */ -void serial_set_baud(uint32_t baud) {} -void serial_setbrg(void) {} -int serial_init(void) { return 0; } -void serial_putc(const char c) __attribute__((alias("jtag_putc"))); -void serial_puts(const char *s) __attribute__((alias("jtag_puts"))); -int serial_tstc(void) __attribute__((alias("jtag_tstc"))); -int serial_getc(void) __attribute__((alias("jtag_getc"))); +void jtag_serial_setbrg(void) +{ +} + +int jtag_serial_init(void) +{ + return 0; +} + +static struct serial_device serial_jtag_drv = { + .name = "jtag", + .start = jtag_serial_init, + .stop = NULL, + .setbrg = jtag_serial_setbrg, + .putc = jtag_putc, + .puts = jtag_puts, + .tstc = jtag_tstc, + .getc = jtag_getc, +}; + +void bfin_jtag_initialize(void) +{ + serial_register(&serial_jtag_drv); +} + +struct serial_device *default_serial_console(void) +{ + return &serial_jtag_drv; +} #endif diff --git a/common/serial.c b/common/serial.c index 0a43c1b..25aeea0 100644 --- a/common/serial.c +++ b/common/serial.c @@ -46,6 +46,7 @@ serial_initfunc(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize); serial_initfunc(s5p_serial_initialize); serial_initfunc(bfin_serial_initialize); +serial_initfunc(bfin_jtag_initialize); serial_initfunc(mpc512x_serial_initialize); serial_initfunc(uartlite_serial_initialize);

@@ -73,6 +74,7 @@ void serial_initialize(void) s5p_serial_initialize(); mpc512x_serial_initialize(); bfin_serial_initialize(); + bfin_jtag_initialize(); uartlite_serial_initialize(); serial_assign(default_serial_console()->name); } diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 3fbf5c6..7132f8f 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -108,11 +108,11 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_JTAG_CONSOLE #define CONFIG_SILENT_CONSOLE +#define CONFIG_SERIAL_MULTI #ifndef CONFIG_BAUDRATE # define CONFIG_BAUDRATE 57600 #endif #ifndef CONFIG_DEBUG_EARLY_SERIAL -# define CONFIG_SERIAL_MULTI # define CONFIG_SYS_BFIN_UART #endif

Implement support for CONFIG_SERIAL_MULTI into asc serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the asc driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Daniel Schwierzeck daniel.schwierzeck@googlemail.com --- arch/mips/cpu/mips32/incaip/asc_serial.c | 67 +++++++++++++++++++++++++++--- common/serial.c | 2 + 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/arch/mips/cpu/mips32/incaip/asc_serial.c b/arch/mips/cpu/mips32/incaip/asc_serial.c index 7239804..b5f32e2 100644 --- a/arch/mips/cpu/mips32/incaip/asc_serial.c +++ b/arch/mips/cpu/mips32/incaip/asc_serial.c @@ -5,6 +5,8 @@ #include <config.h> #include <common.h> #include <asm/inca-ip.h> +#include <serial.h> +#include <linux/compiler.h> #include "asc_serial.h"

@@ -32,7 +34,7 @@ static volatile incaAsc_t *pAsc = (incaAsc_t *)INCA_IP_ASC; * RETURNS: N/A */

-int serial_init (void) +static int asc_serial_init(void) { /* we have to set PMU.EN13 bit to enable an ASC device*/ INCAASC_PMU_ENABLE(13); @@ -82,7 +84,7 @@ int serial_init (void) return 0; }

-void serial_setbrg (void) +static void asc_serial_setbrg(void) { ulong uiReloadValue, fdv; ulong f_ASC; @@ -210,7 +212,7 @@ static int serial_setopt (void) return 0; }

-void serial_putc (const char c) +static void asc_serial_putc(const char c) { uint txFl = 0;

@@ -234,7 +236,7 @@ void serial_putc (const char c) } }

-void serial_puts (const char *s) +static void asc_serial_puts(const char *s) { while (*s) { @@ -242,7 +244,7 @@ void serial_puts (const char *s) } }

-int serial_getc (void) +static int asc_serial_getc(void) { ulong symbol_mask; char c; @@ -257,7 +259,7 @@ int serial_getc (void) return c; }

-int serial_tstc (void) +static int asc_serial_tstc(void) { int res = 1;

@@ -283,3 +285,56 @@ int serial_tstc (void)

return res; } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device asc_serial_drv = { + .name = "asc_serial", + .start = asc_serial_init, + .stop = NULL, + .setbrg = asc_serial_setbrg, + .putc = asc_serial_putc, + .puts = asc_serial_puts, + .getc = asc_serial_getc, + .tstc = asc_serial_tstc, +}; + +void asc_serial_initialize(void) +{ + serial_register(&asc_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &asc_serial_drv; +} +#else +int serial_init(void) +{ + return asc_serial_init(); +} + +void serial_setbrg(void) +{ + asc_serial_setbrg(); +} + +void serial_putc(const char c) +{ + asc_serial_putc(c); +} + +void serial_puts(const char *s) +{ + asc_serial_puts(s); +} + +int serial_getc(void) +{ + return asc_serial_getc(); +} + +int serial_tstc(void) +{ + return asc_serial_tstc(); +} +#endif diff --git a/common/serial.c b/common/serial.c index 6ddc5fa..d6e83f8 100644 --- a/common/serial.c +++ b/common/serial.c @@ -50,6 +50,7 @@ serial_initfunc(bfin_jtag_initialize); serial_initfunc(mpc512x_serial_initialize); serial_initfunc(uartlite_serial_initialize); serial_initfunc(au1x00_serial_initialize); +serial_initfunc(asc_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -78,6 +79,7 @@ void serial_initialize(void) bfin_jtag_initialize(); uartlite_serial_initialize(); au1x00_serial_initialize(); + asc_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into mpc5xx serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the mpc5xx driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- arch/powerpc/cpu/mpc5xx/serial.c | 95 +++++++++++++++++++++++++++++--------- common/serial.c | 2 + 2 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/arch/powerpc/cpu/mpc5xx/serial.c b/arch/powerpc/cpu/mpc5xx/serial.c index 88c6db8..dbaacfc 100644 --- a/arch/powerpc/cpu/mpc5xx/serial.c +++ b/arch/powerpc/cpu/mpc5xx/serial.c @@ -33,20 +33,40 @@ #include <watchdog.h> #include <command.h> #include <mpc5xx.h> +#include <serial.h> +#include <linux/compiler.h>

DECLARE_GLOBAL_DATA_PTR;

/* - * Local function prototypes + * Local functions */

-static int ready_to_send(void); +static int ready_to_send(void) +{ + volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; + volatile short status; + + do { +#if defined(CONFIG_5xx_CONS_SCI1) + status = immr->im_qsmcm.qsmcm_sc1sr; +#else + status = immr->im_qsmcm.qsmcm_sc2sr; +#endif + +#if defined(CONFIG_WATCHDOG) + reset_5xx_watchdog (immr); +#endif + } while ((status & SCI_TDRE) == 0); + return 1; + +}

/* * Minimal global serial functions needed to use one of the SCI modules. */

-int serial_init (void) +static int mpc5xx_serial_init(void) { volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;

@@ -63,7 +83,7 @@ int serial_init (void) return 0; }

-void serial_putc(const char c) +static void mpc5xx_serial_putc(const char c) { volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;

@@ -85,7 +105,7 @@ void serial_putc(const char c) } }

-int serial_getc(void) +static int mpc5xx_serial_getc(void) { volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; volatile short status; @@ -113,7 +133,7 @@ int serial_getc(void) return tmp; }

-int serial_tstc() +static int mpc5xx_serial_tstc() { volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; short status; @@ -127,7 +147,7 @@ int serial_tstc() return (status & SCI_RDRF); }

-void serial_setbrg (void) +static void mpc5xx_serial_setbrg(void) { volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; short scxbr; @@ -141,7 +161,7 @@ void serial_setbrg (void) #endif }

-void serial_puts (const char *s) +static void mpc5xx_serial_puts(const char *s) { while (*s) { serial_putc(*s); @@ -149,22 +169,55 @@ void serial_puts (const char *s) } }

-int ready_to_send(void) +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device mpc5xx_serial_drv = { + .name = "mpc5xx_serial", + .start = mpc5xx_serial_init, + .stop = NULL, + .setbrg = mpc5xx_serial_setbrg, + .putc = mpc5xx_serial_putc, + .puts = mpc5xx_serial_puts, + .getc = mpc5xx_serial_getc, + .tstc = mpc5xx_serial_tstc, +}; + +void mpc5xx_serial_initialize(void) { - volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; - volatile short status; + serial_register(&mpc5xx_serial_drv); +}

- do { -#if defined(CONFIG_5xx_CONS_SCI1) - status = immr->im_qsmcm.qsmcm_sc1sr; +__weak struct serial_device *default_serial_console(void) +{ + return &mpc5xx_serial_drv; +} #else - status = immr->im_qsmcm.qsmcm_sc2sr; -#endif +int serial_init(void) +{ + return mpc5xx_serial_init(); +}

-#if defined(CONFIG_WATCHDOG) - reset_5xx_watchdog (immr); -#endif - } while ((status & SCI_TDRE) == 0); - return 1; +void serial_setbrg(void) +{ + mpc5xx_serial_setbrg(); +}

+void serial_putc(const char c) +{ + mpc5xx_serial_putc(c); } + +void serial_puts(const char *s) +{ + mpc5xx_serial_puts(s); +} + +int serial_getc(void) +{ + return mpc5xx_serial_getc(); +} + +int serial_tstc(void) +{ + return mpc5xx_serial_tstc(); +} +#endif diff --git a/common/serial.c b/common/serial.c index dd35a62..69fa583 100644 --- a/common/serial.c +++ b/common/serial.c @@ -52,6 +52,7 @@ serial_initfunc(uartlite_serial_initialize); serial_initfunc(au1x00_serial_initialize); serial_initfunc(asc_serial_initialize); serial_initfunc(jz_serial_initialize); +serial_initfunc(mpc5xx_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -82,6 +83,7 @@ void serial_initialize(void) au1x00_serial_initialize(); asc_serial_initialize(); jz_serial_initialize(); + mpc5xx_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into both SCC and SMC mpc8260 serial drivers. These drivers were so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the mpc8260 drivers. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- arch/powerpc/cpu/mpc8260/serial_scc.c | 71 ++++++++++++++++++++++++++++----- arch/powerpc/cpu/mpc8260/serial_smc.c | 71 ++++++++++++++++++++++++++++----- common/serial.c | 4 ++ 3 files changed, 124 insertions(+), 22 deletions(-)

diff --git a/arch/powerpc/cpu/mpc8260/serial_scc.c b/arch/powerpc/cpu/mpc8260/serial_scc.c index 4ab6a28..cfbcd79 100644 --- a/arch/powerpc/cpu/mpc8260/serial_scc.c +++ b/arch/powerpc/cpu/mpc8260/serial_scc.c @@ -31,6 +31,8 @@ #include <common.h> #include <mpc8260.h> #include <asm/cpm_8260.h> +#include <serial.h> +#include <linux/compiler.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -82,7 +84,7 @@ DECLARE_GLOBAL_DATA_PTR;

#endif

-int serial_init (void) +static int mpc8260_scc_serial_init(void) { volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile scc_t *sp; @@ -180,8 +182,7 @@ int serial_init (void) return (0); }

-void -serial_setbrg (void) +static void mpc8260_scc_serial_setbrg(void) { #if defined(CONFIG_CONS_USE_EXTC) m8260_cpm_extcbrg(SCC_INDEX, gd->baudrate, @@ -191,8 +192,7 @@ serial_setbrg (void) #endif }

-void -serial_putc(const char c) +static void mpc8260_scc_serial_putc(const char c) { volatile scc_uart_t *up; volatile cbd_t *tbdf; @@ -217,16 +217,14 @@ serial_putc(const char c) tbdf->cbd_sc |= BD_SC_READY; }

-void -serial_puts (const char *s) +static void mpc8260_scc_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

-int -serial_getc(void) +static int mpc8260_scc_serial_getc(void) { volatile cbd_t *rbdf; volatile scc_uart_t *up; @@ -250,8 +248,7 @@ serial_getc(void) return (c); }

-int -serial_tstc() +static int mpc8260_scc_serial_tstc(void) { volatile cbd_t *rbdf; volatile scc_uart_t *up; @@ -264,6 +261,58 @@ serial_tstc() return ((rbdf->cbd_sc & BD_SC_EMPTY) == 0); }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device mpc8260_scc_serial_drv = { + .name = "mpc8260_scc_serial", + .start = mpc8260_scc_serial_init, + .stop = NULL, + .setbrg = mpc8260_scc_serial_setbrg, + .putc = mpc8260_scc_serial_putc, + .puts = mpc8260_scc_serial_puts, + .getc = mpc8260_scc_serial_getc, + .tstc = mpc8260_scc_serial_tstc, +}; + +void mpc8260_scc_serial_initialize(void) +{ + serial_register(&mpc8260_scc_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &mpc8260_scc_serial_drv; +} +#else +int serial_init(void) +{ + return mpc8260_scc_serial_init(); +} + +void serial_setbrg(void) +{ + mpc8260_scc_serial_setbrg(); +} + +void serial_putc(const char c) +{ + mpc8260_scc_serial_putc(c); +} + +void serial_puts(const char *s) +{ + mpc8260_scc_serial_puts(s); +} + +int serial_getc(void) +{ + return mpc8260_scc_serial_getc(); +} + +int serial_tstc(void) +{ + return mpc8260_scc_serial_tstc(); +} +#endif #endif /* CONFIG_CONS_ON_SCC */

#if defined(CONFIG_KGDB_ON_SCC) diff --git a/arch/powerpc/cpu/mpc8260/serial_smc.c b/arch/powerpc/cpu/mpc8260/serial_smc.c index 7b6eaba..012fc98 100644 --- a/arch/powerpc/cpu/mpc8260/serial_smc.c +++ b/arch/powerpc/cpu/mpc8260/serial_smc.c @@ -33,6 +33,8 @@ #include <common.h> #include <mpc8260.h> #include <asm/cpm_8260.h> +#include <serial.h> +#include <linux/compiler.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -91,7 +93,7 @@ static unsigned char brg_map[] = { 3, /* BRG1 for SCC4 */ };

-int serial_init (void) +static int mpc8260_smc_serial_init(void) { volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile smc_t *sp; @@ -183,8 +185,7 @@ int serial_init (void) return (0); }

-void -serial_setbrg (void) +static void mpc8260_smc_serial_setbrg(void) { #if defined(CONFIG_CONS_USE_EXTC) m8260_cpm_extcbrg(brg_map[SMC_INDEX], gd->baudrate, @@ -194,8 +195,7 @@ serial_setbrg (void) #endif }

-void -serial_putc(const char c) +static void mpc8260_smc_serial_putc(const char c) { volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; @@ -216,16 +216,14 @@ serial_putc(const char c) rtx->txbd.cbd_sc |= BD_SC_READY; }

-void -serial_puts (const char *s) +static void mpc8260_smc_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

-int -serial_getc(void) +static int mpc8260_smc_serial_getc(void) { volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; @@ -254,8 +252,7 @@ serial_getc(void) return(c); }

-int -serial_tstc() +static int mpc8260_smc_serial_tstc(void) { volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; @@ -267,6 +264,58 @@ serial_tstc() return !(rtx->rxbd.cbd_sc & BD_SC_EMPTY); }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device mpc8260_smc_serial_drv = { + .name = "mpc8260_smc_serial", + .start = mpc8260_smc_serial_init, + .stop = NULL, + .setbrg = mpc8260_smc_serial_setbrg, + .putc = mpc8260_smc_serial_putc, + .puts = mpc8260_smc_serial_puts, + .getc = mpc8260_smc_serial_getc, + .tstc = mpc8260_smc_serial_tstc, +}; + +void mpc8260_smc_serial_initialize(void) +{ + serial_register(&mpc8260_smc_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &mpc8260_smc_serial_drv; +} +#else +int serial_init(void) +{ + return mpc8260_smc_serial_init(); +} + +void serial_setbrg(void) +{ + mpc8260_smc_serial_setbrg(); +} + +void serial_putc(const char c) +{ + mpc8260_smc_serial_putc(c); +} + +void serial_puts(const char *s) +{ + mpc8260_smc_serial_puts(s); +} + +int serial_getc(void) +{ + return mpc8260_smc_serial_getc(); +} + +int serial_tstc(void) +{ + return mpc8260_smc_serial_tstc(); +} +#endif #endif /* CONFIG_CONS_ON_SMC */

#if defined(CONFIG_KGDB_ON_SMC) diff --git a/common/serial.c b/common/serial.c index db06f97..5c8cbdd 100644 --- a/common/serial.c +++ b/common/serial.c @@ -54,6 +54,8 @@ serial_initfunc(asc_serial_initialize); serial_initfunc(jz_serial_initialize); serial_initfunc(mpc5xx_serial_initialize); serial_initfunc(mpc8220_serial_initialize); +serial_initfunc(mpc8260_scc_serial_initialize); +serial_initfunc(mpc8260_smc_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -86,6 +88,8 @@ void serial_initialize(void) jz_serial_initialize(); mpc5xx_serial_initialize(); mpc8220_serial_initialize(); + mpc8260_scc_serial_initialize(); + mpc8260_smc_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into iop480 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the iop480 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- arch/powerpc/cpu/ppc4xx/iop480_uart.c | 65 ++++++++++++++++++++++++++++++--- common/serial.c | 2 + 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/cpu/ppc4xx/iop480_uart.c b/arch/powerpc/cpu/ppc4xx/iop480_uart.c index 027ca30..fb25e15 100644 --- a/arch/powerpc/cpu/ppc4xx/iop480_uart.c +++ b/arch/powerpc/cpu/ppc4xx/iop480_uart.c @@ -29,6 +29,7 @@

#ifdef CONFIG_SERIAL_MULTI #include <serial.h> +#include <linux/compiler.h> #endif

DECLARE_GLOBAL_DATA_PTR; @@ -132,7 +133,7 @@ DECLARE_GLOBAL_DATA_PTR; * as serial console interface. */

-int serial_init (void) +static int iop480_serial_init(void) { unsigned short br_reg;

@@ -153,7 +154,7 @@ int serial_init (void) return (0); }

-void serial_setbrg (void) +static void iop480_serial_setbrg(void) { unsigned short br_reg;

@@ -165,7 +166,7 @@ void serial_setbrg (void) ((br_reg & 0xff00) >> 8)); /* ... */ }

-void serial_putc (const char c) +static void iop480_serial_putc(const char c) { if (c == '\n') serial_putc ('\r'); @@ -182,14 +183,14 @@ void serial_putc (const char c) } }

-void serial_puts (const char *s) +static void iop480_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

-int serial_getc () +static int iop480_serial_getc(void) { unsigned char status = 0;

@@ -212,7 +213,7 @@ int serial_getc () return (0x000000ff & (int) in_8((u8 *)asyncRxBufferport1)); }

-int serial_tstc () +static int iop480_serial_tstc(void) { unsigned char status;

@@ -233,4 +234,56 @@ int serial_tstc () return 0; }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device iop480_serial_drv = { + .name = "iop480_serial", + .start = iop480_serial_init, + .stop = NULL, + .setbrg = iop480_serial_setbrg, + .putc = iop480_serial_putc, + .puts = iop480_serial_puts, + .getc = iop480_serial_getc, + .tstc = iop480_serial_tstc, +}; + +void iop480_serial_initialize(void) +{ + serial_register(&iop480_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &iop480_serial_drv; +} +#else +int serial_init(void) +{ + return iop480_serial_init(); +} + +void serial_setbrg(void) +{ + iop480_serial_setbrg(); +} + +void serial_putc(const char c) +{ + iop480_serial_putc(c); +} + +void serial_puts(const char *s) +{ + iop480_serial_puts(s); +} + +int serial_getc(void) +{ + return iop480_serial_getc(); +} + +int serial_tstc(void) +{ + return iop480_serial_tstc(); +} +#endif #endif /* CONFIG_IOP480 */ diff --git a/common/serial.c b/common/serial.c index aeae51d..398ad30 100644 --- a/common/serial.c +++ b/common/serial.c @@ -57,6 +57,7 @@ serial_initfunc(mpc8220_serial_initialize); serial_initfunc(mpc8260_scc_serial_initialize); serial_initfunc(mpc8260_smc_serial_initialize); serial_initfunc(mpc85xx_serial_initialize); +serial_initfunc(iop480_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -92,6 +93,7 @@ void serial_initialize(void) mpc8260_scc_serial_initialize(); mpc8260_smc_serial_initialize(); mpc85xx_serial_initialize(); + iop480_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into leon2 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the leon2 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Peter Tyser ptyser@xes-inc.com --- arch/sparc/cpu/leon2/serial.c | 83 ++++++++++++++++++++++++++++++++++------- common/serial.c | 2 + 2 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/arch/sparc/cpu/leon2/serial.c b/arch/sparc/cpu/leon2/serial.c index 4f41b8e..61d059b 100644 --- a/arch/sparc/cpu/leon2/serial.c +++ b/arch/sparc/cpu/leon2/serial.c @@ -26,6 +26,8 @@ #include <common.h> #include <asm/processor.h> #include <asm/leon.h> +#include <serial.h> +#include <linux/compiler.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -39,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR; #define READ_DWORD(var) SPARC_NOCACHE_READ_DWORD((unsigned int)&(var)) #endif

-int serial_init(void) +static int leon2_serial_init(void) { LEON2_regs *leon2 = (LEON2_regs *) LEON2_PREGS; LEON2_Uart_regs *regs; @@ -72,15 +74,7 @@ int serial_init(void) return 0; }

-void serial_putc(const char c) -{ - if (c == '\n') - serial_putc_raw('\r'); - - serial_putc_raw(c); -} - -void serial_putc_raw(const char c) +static void leon2_serial_putc_raw(const char c) { LEON2_regs *leon2 = (LEON2_regs *) LEON2_PREGS; LEON2_Uart_regs *regs; @@ -103,14 +97,22 @@ void serial_putc_raw(const char c) #endif }

-void serial_puts(const char *s) +static void leon2_serial_putc(const char c) +{ + if (c == '\n') + leon2_serial_putc_raw('\r'); + + leon2_serial_putc_raw(c); +} + +static void leon2_serial_puts(const char *s) { while (*s) { serial_putc(*s++); } }

-int serial_getc(void) +static int leon2_serial_getc(void) { LEON2_regs *leon2 = (LEON2_regs *) LEON2_PREGS; LEON2_Uart_regs *regs; @@ -128,7 +130,7 @@ int serial_getc(void) return READ_WORD(regs->UART_Channel); }

-int serial_tstc(void) +static int leon2_serial_tstc(void) { LEON2_regs *leon2 = (LEON2_regs *) LEON2_PREGS; LEON2_Uart_regs *regs; @@ -143,7 +145,7 @@ int serial_tstc(void) }

/* set baud rate for uart */ -void serial_setbrg(void) +static void leon2_serial_setbrg(void) { /* update baud rate settings, read it from gd->baudrate */ unsigned int scaler; @@ -163,3 +165,56 @@ void serial_setbrg(void) regs->UART_Scaler = scaler; } } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device leon2_serial_drv = { + .name = "leon2_serial", + .start = leon2_serial_init, + .stop = NULL, + .setbrg = leon2_serial_setbrg, + .putc = leon2_serial_putc, + .puts = leon2_serial_puts, + .getc = leon2_serial_getc, + .tstc = leon2_serial_tstc, +}; + +void leon2_serial_initialize(void) +{ + serial_register(&leon2_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &leon2_serial_drv; +} +#else +int serial_init(void) +{ + return leon2_serial_init(); +} + +void serial_setbrg(void) +{ + leon2_serial_setbrg(); +} + +void serial_putc(const char c) +{ + leon2_serial_putc(c); +} + +void serial_puts(const char *s) +{ + leon2_serial_puts(s); +} + +int serial_getc(void) +{ + return leon2_serial_getc(); +} + +int serial_tstc(void) +{ + return leon2_serial_tstc(); +} +#endif diff --git a/common/serial.c b/common/serial.c index 398ad30..8848126 100644 --- a/common/serial.c +++ b/common/serial.c @@ -58,6 +58,7 @@ serial_initfunc(mpc8260_scc_serial_initialize); serial_initfunc(mpc8260_smc_serial_initialize); serial_initfunc(mpc85xx_serial_initialize); serial_initfunc(iop480_serial_initialize); +serial_initfunc(leon2_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -94,6 +95,7 @@ void serial_initialize(void) mpc8260_smc_serial_initialize(); mpc85xx_serial_initialize(); iop480_serial_initialize(); + leon2_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into marvell serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the marvell driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- board/Marvell/common/serial.c | 80 ++++++++++++++++++++++++++++++++++------- common/serial.c | 2 ++ 2 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c index 3e7f406..a5231eb 100644 --- a/board/Marvell/common/serial.c +++ b/board/Marvell/common/serial.c @@ -32,6 +32,9 @@

#include <common.h> #include <command.h> +#include <serial.h> +#include <linux/compiler.h> + #include "../include/memory.h" #include "serial.h"

@@ -48,9 +51,7 @@ DECLARE_GLOBAL_DATA_PTR;

#ifdef CONFIG_MPSC - - -int serial_init (void) +static int marvell_serial_init(void) { #if (defined CONFIG_SYS_INIT_CHAN1) || (defined CONFIG_SYS_INIT_CHAN2) int clock_divisor = 230400 / gd->baudrate; @@ -68,7 +69,7 @@ int serial_init (void) return (0); }

-void serial_putc (const char c) +static void marvell_serial_putc(const char c) { if (c == '\n') mpsc_putchar ('\r'); @@ -76,24 +77,24 @@ void serial_putc (const char c) mpsc_putchar (c); }

-int serial_getc (void) +static int marvell_serial_getc(void) { return mpsc_getchar (); }

-int serial_tstc (void) +static int marvell_serial_tstc(void) { return mpsc_test_char (); }

-void serial_setbrg (void) +static void marvell_serial_setbrg(void) { galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate); }

#else /* ! CONFIG_MPSC */

-int serial_init (void) +static int marvell_serial_init(void) { int clock_divisor = 230400 / gd->baudrate;

@@ -106,7 +107,7 @@ int serial_init (void) return (0); }

-void serial_putc (const char c) +static void marvell_serial_putc(const char c) { if (c == '\n') NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], '\r'); @@ -114,17 +115,17 @@ void serial_putc (const char c) NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], c); }

-int serial_getc (void) +static int marvell_serial_getc(void) { return NS16550_getc (COM_PORTS[CONFIG_SYS_DUART_CHAN]); }

-int serial_tstc (void) +static int marvell_serial_tstc(void) { return NS16550_tstc (COM_PORTS[CONFIG_SYS_DUART_CHAN]); }

-void serial_setbrg (void) +static void marvell_serial_setbrg(void) { int clock_divisor = 230400 / gd->baudrate;

@@ -138,13 +139,66 @@ void serial_setbrg (void)

#endif /* CONFIG_MPSC */

-void serial_puts (const char *s) +static void marvell_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device marvell_serial_drv = { + .name = "marvell_serial", + .start = marvell_serial_init, + .stop = NULL, + .setbrg = marvell_serial_setbrg, + .putc = marvell_serial_putc, + .puts = marvell_serial_puts, + .getc = marvell_serial_getc, + .tstc = marvell_serial_tstc, +}; + +void marvell_serial_initialize(void) +{ + serial_register(&marvell_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &marvell_serial_drv; +} +#else +int serial_init(void) +{ + return marvell_serial_init(); +} + +void serial_setbrg(void) +{ + marvell_serial_setbrg(); +} + +void serial_putc(const char c) +{ + marvell_serial_putc(c); +} + +void serial_puts(const char *s) +{ + marvell_serial_puts(s); +} + +int serial_getc(void) +{ + return marvell_serial_getc(); +} + +int serial_tstc(void) +{ + return marvell_serial_tstc(); +} +#endif + #if defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { diff --git a/common/serial.c b/common/serial.c index 4907009..0288b49 100644 --- a/common/serial.c +++ b/common/serial.c @@ -60,6 +60,7 @@ serial_initfunc(mpc85xx_serial_initialize); serial_initfunc(iop480_serial_initialize); serial_initfunc(leon2_serial_initialize); serial_initfunc(leon3_serial_initialize); +serial_initfunc(marvell_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -98,6 +99,7 @@ void serial_initialize(void) iop480_serial_initialize(); leon2_serial_initialize(); leon3_serial_initialize(); + marvell_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into bmw serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the bmw driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- board/bmw/serial.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++----- common/serial.c | 2 ++ 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/board/bmw/serial.c b/board/bmw/serial.c index 0c97f12..569131f 100644 --- a/board/bmw/serial.c +++ b/board/bmw/serial.c @@ -22,6 +22,9 @@ */

#include <common.h> +#include <serial.h> +#include <linux/compiler.h> + #include "ns16550.h"

DECLARE_GLOBAL_DATA_PTR; @@ -38,7 +41,7 @@ static struct NS16550 *console =

extern ulong get_bus_freq (ulong);

-int serial_init (void) +static int bmw_serial_init(void) { int clock_divisor = gd->bus_clk / 16 / gd->baudrate;

@@ -47,7 +50,7 @@ int serial_init (void) return (0); }

-void serial_putc (const char c) +static void bmw_serial_putc(const char c) { if (c == '\n') { serial_putc ('\r'); @@ -55,7 +58,7 @@ void serial_putc (const char c) NS16550_putc (console, c); }

-void serial_puts (const char *s) +static void bmw_serial_puts(const char *s) { while (*s) { serial_putc (*s++); @@ -63,19 +66,72 @@ void serial_puts (const char *s) }

-int serial_getc (void) +static int bmw_serial_getc(void) { return NS16550_getc (console); }

-int serial_tstc (void) +static int bmw_serial_tstc(void) { return NS16550_tstc (console); }

-void serial_setbrg (void) +static void bmw_serial_setbrg(void) { int clock_divisor = get_bus_freq (0) / 16 / gd->baudrate;

NS16550_reinit (console, clock_divisor); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device bmw_serial_drv = { + .name = "bmw_serial", + .start = bmw_serial_init, + .stop = NULL, + .setbrg = bmw_serial_setbrg, + .putc = bmw_serial_putc, + .puts = bmw_serial_puts, + .getc = bmw_serial_getc, + .tstc = bmw_serial_tstc, +}; + +void bmw_serial_initialize(void) +{ + serial_register(&bmw_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &bmw_serial_drv; +} +#else +int serial_init(void) +{ + return bmw_serial_init(); +} + +void serial_setbrg(void) +{ + bmw_serial_setbrg(); +} + +void serial_putc(const char c) +{ + bmw_serial_putc(c); +} + +void serial_puts(const char *s) +{ + bmw_serial_puts(s); +} + +int serial_getc(void) +{ + return bmw_serial_getc(); +} + +int serial_tstc(void) +{ + return bmw_serial_tstc(); +} +#endif diff --git a/common/serial.c b/common/serial.c index 6a09139..19d3a6f 100644 --- a/common/serial.c +++ b/common/serial.c @@ -62,6 +62,7 @@ serial_initfunc(leon2_serial_initialize); serial_initfunc(leon3_serial_initialize); serial_initfunc(marvell_serial_initialize); serial_initfunc(amirix_serial_initialize); +serial_initfunc(bmw_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -102,6 +103,7 @@ void serial_initialize(void) leon3_serial_initialize(); marvell_serial_initialize(); amirix_serial_initialize(); + bmw_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into cpci750 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the cpci750 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- board/esd/cpci750/serial.c | 67 ++++++++++++++++++++++++++++++++++++++++---- common/serial.c | 2 ++ 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c index e1af37e..9ff7c27 100644 --- a/board/esd/cpci750/serial.c +++ b/board/esd/cpci750/serial.c @@ -35,6 +35,9 @@

#include <common.h> #include <command.h> +#include <serial.h> +#include <linux/compiler.h> + #include "../../Marvell/include/memory.h" #include "serial.h"

@@ -42,14 +45,14 @@

DECLARE_GLOBAL_DATA_PTR;

-int serial_init (void) +static int cpci750_serial_init(void) { mpsc_init (gd->baudrate);

return (0); }

-void serial_putc (const char c) +static void cpci750_serial_putc(const char c) { if (c == '\n') mpsc_putchar ('\r'); @@ -57,29 +60,81 @@ void serial_putc (const char c) mpsc_putchar (c); }

-int serial_getc (void) +static int cpci750_serial_getc(void) { return mpsc_getchar (); }

-int serial_tstc (void) +static int cpci750_serial_tstc(void) { return mpsc_test_char (); }

-void serial_setbrg (void) +static void cpci750_serial_setbrg(void) { galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate); }

-void serial_puts (const char *s) +static void cpci750_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device cpci750_serial_drv = { + .name = "cpci750_serial", + .start = cpci750_serial_init, + .stop = NULL, + .setbrg = cpci750_serial_setbrg, + .putc = cpci750_serial_putc, + .puts = cpci750_serial_puts, + .getc = cpci750_serial_getc, + .tstc = cpci750_serial_tstc, +}; + +void cpci750_serial_initialize(void) +{ + serial_register(&cpci750_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &cpci750_serial_drv; +} +#else +int serial_init(void) +{ + return cpci750_serial_init(); +} + +void serial_setbrg(void) +{ + cpci750_serial_setbrg(); +} + +void serial_putc(const char c) +{ + cpci750_serial_putc(c); +} + +void serial_puts(const char *s) +{ + cpci750_serial_puts(s); +} + +int serial_getc(void) +{ + return cpci750_serial_getc(); +} + +int serial_tstc(void) +{ + return cpci750_serial_tstc(); +} +#endif #if defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { diff --git a/common/serial.c b/common/serial.c index a51ce99..c77d3ba 100644 --- a/common/serial.c +++ b/common/serial.c @@ -64,6 +64,7 @@ serial_initfunc(marvell_serial_initialize); serial_initfunc(amirix_serial_initialize); serial_initfunc(bmw_serial_initialize); serial_initfunc(cogent_serial_initialize); +serial_initfunc(cpci750_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -106,6 +107,7 @@ void serial_initialize(void) amirix_serial_initialize(); bmw_serial_initialize(); cogent_serial_initialize(); + cpci750_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into ml2 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the ml2 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- board/ml2/serial.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++----- common/serial.c | 2 ++ 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/board/ml2/serial.c b/board/ml2/serial.c index d9113ab..0ed1150 100644 --- a/board/ml2/serial.c +++ b/board/ml2/serial.c @@ -24,6 +24,8 @@ #include <asm/processor.h> #include <command.h> #include <configs/ML2.h> +#include <serial.h> +#include <linux/compiler.h>

#if (defined CONFIG_SYS_INIT_CHAN1) || (defined CONFIG_SYS_INIT_CHAN2) #include <ns16550.h> @@ -37,7 +39,7 @@ const NS16550_t COM_PORTS[] = { (NS16550_t) CONFIG_SYS_NS16550_COM1, }; #endif

-int serial_init (void) +static int ml2_serial_init(void) { int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / gd->baudrate;

@@ -51,7 +53,7 @@ int serial_init (void)

}

-void serial_putc (const char c) +static void ml2_serial_putc(const char c) { if (c == '\n') NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], '\r'); @@ -59,17 +61,17 @@ void serial_putc (const char c) NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], c); }

-int serial_getc (void) +static int ml2_serial_getc(void) { return NS16550_getc (COM_PORTS[CONFIG_SYS_DUART_CHAN]); }

-int serial_tstc (void) +static int ml2_serial_tstc(void) { return NS16550_tstc (COM_PORTS[CONFIG_SYS_DUART_CHAN]); }

-void serial_setbrg (void) +static void ml2_serial_setbrg(void) { int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / gd->baudrate;

@@ -81,13 +83,65 @@ void serial_setbrg (void) #endif }

-void serial_puts (const char *s) +static void ml2_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device ml2_serial_drv = { + .name = "ml2_serial", + .start = ml2_serial_init, + .stop = NULL, + .setbrg = ml2_serial_setbrg, + .putc = ml2_serial_putc, + .puts = ml2_serial_puts, + .getc = ml2_serial_getc, + .tstc = ml2_serial_tstc, +}; + +void ml2_serial_initialize(void) +{ + serial_register(&ml2_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &ml2_serial_drv; +} +#else +int serial_init(void) +{ + return ml2_serial_init(); +} + +void serial_setbrg(void) +{ + ml2_serial_setbrg(); +} + +void serial_putc(const char c) +{ + ml2_serial_putc(c); +} + +void serial_puts(const char *s) +{ + ml2_serial_puts(s); +} + +int serial_getc(void) +{ + return ml2_serial_getc(); +} + +int serial_tstc(void) +{ + return ml2_serial_tstc(); +} +#endif #if defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { diff --git a/common/serial.c b/common/serial.c index 2acf4c1..393e296 100644 --- a/common/serial.c +++ b/common/serial.c @@ -66,6 +66,7 @@ serial_initfunc(bmw_serial_initialize); serial_initfunc(cogent_serial_initialize); serial_initfunc(cpci750_serial_initialize); serial_initfunc(evb64260_serial_initialize); +serial_initfunc(ml2_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -110,6 +111,7 @@ void serial_initialize(void) cogent_serial_initialize(); cpci750_serial_initialize(); evb64260_serial_initialize(); + ml2_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into sconsole serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the sconsole driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- board/pcippc2/sconsole.c | 66 +++++++++++++++++++++++++++++++++++++++++----- common/serial.c | 2 ++ 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/board/pcippc2/sconsole.c b/board/pcippc2/sconsole.c index 6ef38f4..0a31963 100644 --- a/board/pcippc2/sconsole.c +++ b/board/pcippc2/sconsole.c @@ -23,6 +23,8 @@

#include <config.h> #include <common.h> +#include <serial.h> +#include <linux/compiler.h>

#include "sconsole.h"

@@ -34,7 +36,7 @@ int (*sconsole_getc) (void) = 0; int (*sconsole_tstc) (void) = 0; void (*sconsole_setbrg) (void) = 0;

-int serial_init (void) +static int sconsole_serial_init(void) { sconsole_buffer_t *sb = SCONSOLE_BUFFER;

@@ -46,7 +48,7 @@ int serial_init (void) return (0); }

-void serial_putc (char c) +static void sconsole_serial_putc(char c) { if (sconsole_putc) { (*sconsole_putc) (c); @@ -65,7 +67,7 @@ void serial_putc (char c) } }

-void serial_puts (const char *s) +static void sconsole_serial_puts(const char *s) { if (sconsole_puts) { (*sconsole_puts) (s); @@ -84,7 +86,7 @@ void serial_puts (const char *s) } }

-int serial_getc (void) +static int sconsole_serial_getc(void) { if (sconsole_getc) { return (*sconsole_getc) (); @@ -93,7 +95,7 @@ int serial_getc (void) } }

-int serial_tstc (void) +static int sconsole_serial_tstc(void) { if (sconsole_tstc) { return (*sconsole_tstc) (); @@ -102,7 +104,7 @@ int serial_tstc (void) } }

-void serial_setbrg (void) +static void sconsole_serial_setbrg(void) { if (sconsole_setbrg) { (*sconsole_setbrg) (); @@ -113,6 +115,58 @@ void serial_setbrg (void) } }

+#ifdef CONFIG_SERIAL_MULTI +static struct serial_device sconsole_serial_drv = { + .name = "sconsole_serial", + .start = sconsole_serial_init, + .stop = NULL, + .setbrg = sconsole_serial_setbrg, + .putc = sconsole_serial_putc, + .puts = sconsole_serial_puts, + .getc = sconsole_serial_getc, + .tstc = sconsole_serial_tstc, +}; + +void sconsole_serial_initialize(void) +{ + serial_register(&sconsole_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &sconsole_serial_drv; +} +#else +int serial_init(void) +{ + return sconsole_serial_init(); +} + +void serial_setbrg(void) +{ + sconsole_serial_setbrg(); +} + +void serial_putc(const char c) +{ + sconsole_serial_putc(c); +} + +void serial_puts(const char *s) +{ + sconsole_serial_puts(s); +} + +int serial_getc(void) +{ + return sconsole_serial_getc(); +} + +int serial_tstc(void) +{ + return sconsole_serial_tstc(); +} +#endif int sconsole_get_baudrate (void) { sconsole_buffer_t *sb = SCONSOLE_BUFFER; diff --git a/common/serial.c b/common/serial.c index 393e296..d9cd3bf 100644 --- a/common/serial.c +++ b/common/serial.c @@ -67,6 +67,7 @@ serial_initfunc(cogent_serial_initialize); serial_initfunc(cpci750_serial_initialize); serial_initfunc(evb64260_serial_initialize); serial_initfunc(ml2_serial_initialize); +serial_initfunc(sconsole_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -112,6 +113,7 @@ void serial_initialize(void) cpci750_serial_initialize(); evb64260_serial_initialize(); ml2_serial_initialize(); + sconsole_serial_initialize();

serial_assign(default_serial_console()->name); }

Implement support for CONFIG_SERIAL_MULTI into altera_jtag serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the altera_jtag driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Thomas Chou thomas@wytron.com.tw --- common/serial.c | 2 ++ drivers/serial/altera_jtag_uart.c | 71 +++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 2d6ba05..24879ec 100644 --- a/common/serial.c +++ b/common/serial.c @@ -69,6 +69,7 @@ serial_initfunc(evb64260_serial_initialize); serial_initfunc(ml2_serial_initialize); serial_initfunc(sconsole_serial_initialize); serial_initfunc(p3mx_serial_initialize); +serial_initfunc(altera_jtag_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -116,6 +117,7 @@ void serial_initialize(void) ml2_serial_initialize(); sconsole_serial_initialize(); p3mx_serial_initialize(); + altera_jtag_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 2980e4d..d3b6c1c 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -33,10 +33,16 @@ DECLARE_GLOBAL_DATA_PTR; *-----------------------------------------------------------------*/ static nios_jtag_t *jtag = (nios_jtag_t *)CONFIG_SYS_NIOS_CONSOLE;

-void serial_setbrg( void ){ return; } -int serial_init( void ) { return(0);} +static void altera_jtag_serial_setbrg(void) +{ +} + +static int altera_jtag_serial_init(void) +{ + return 0; +}

-void serial_putc (char c) +static void altera_jtag_serial_putc(char c) { while (1) { unsigned st = readl(&jtag->control); @@ -51,18 +57,18 @@ void serial_putc (char c) writel ((unsigned char)c, &jtag->data); }

-void serial_puts (const char *s) +static void altera_jtag_serial_puts(const char *s) { while (*s != 0) serial_putc (*s++); }

-int serial_tstc (void) +static int altera_jtag_serial_tstc(void) { return ( readl (&jtag->control) & NIOS_JTAG_RRDY); }

-int serial_getc (void) +static int altera_jtag_serial_getc(void) { int c; unsigned val; @@ -76,3 +82,56 @@ int serial_getc (void) c = val & 0x0ff; return (c); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device altera_jtag_serial_drv = { + .name = "altera_jtag_serial", + .start = altera_jtag_serial_init, + .stop = NULL, + .setbrg = altera_jtag_serial_setbrg, + .putc = altera_jtag_serial_putc, + .puts = altera_jtag_serial_puts, + .getc = altera_jtag_serial_getc, + .tstc = altera_jtag_serial_tstc, +}; + +void altera_jtag_serial_initialize(void) +{ + serial_register(&altera_jtag_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &altera_jtag_serial_drv; +} +#else +int serial_init(void) +{ + return altera_jtag_serial_init(); +} + +void serial_setbrg(void) +{ + altera_jtag_serial_setbrg(); +} + +void serial_putc(const char c) +{ + altera_jtag_serial_putc(c); +} + +void serial_puts(const char *s) +{ + altera_jtag_serial_puts(s); +} + +int serial_getc(void) +{ + return altera_jtag_serial_getc(); +} + +int serial_tstc(void) +{ + return altera_jtag_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into altera serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the altera driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Scott McNutt smcnutt@psyent.com --- common/serial.c | 2 + drivers/serial/altera_uart.c | 83 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 24879ec..e6566da 100644 --- a/common/serial.c +++ b/common/serial.c @@ -70,6 +70,7 @@ serial_initfunc(ml2_serial_initialize); serial_initfunc(sconsole_serial_initialize); serial_initfunc(p3mx_serial_initialize); serial_initfunc(altera_jtag_serial_initialize); +serial_initfunc(altera_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -118,6 +119,7 @@ void serial_initialize(void) sconsole_serial_initialize(); p3mx_serial_initialize(); altera_jtag_serial_initialize(); + altera_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 045f119..18b820b 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -37,27 +37,33 @@ static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE;

#if defined(CONFIG_SYS_NIOS_FIXEDBAUD)

-/* Everything's already setup for fixed-baud PTF +/* + * Everything's already setup for fixed-baud PTF * assignment */ -void serial_setbrg (void){ return; } -int serial_init (void) { return (0);} +static void altera_serial_setbrg(void) +{ +} + +static int altera_serial_init(void) +{ + return 0; +}

#else

-void serial_setbrg (void) +static void altera_serial_setbrg(void) { unsigned div;

div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1; writel (div, &uart->divisor); - return; }

-int serial_init (void) +static int altera_serial_init(void) { - serial_setbrg (); - return (0); + serial_setbrg(); + return 0; }

#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */ @@ -65,7 +71,7 @@ int serial_init (void) /*----------------------------------------------------------------------- * UART CONSOLE *---------------------------------------------------------------------*/ -void serial_putc (char c) +static void altera_serial_putc(char c) { if (c == '\n') serial_putc ('\r'); @@ -74,21 +80,74 @@ void serial_putc (char c) writel ((unsigned char)c, &uart->txdata); }

-void serial_puts (const char *s) +static void altera_serial_puts(const char *s) { while (*s != 0) { serial_putc (*s++); } }

-int serial_tstc (void) +static int altera_serial_tstc(void) { return (readl (&uart->status) & NIOS_UART_RRDY); }

-int serial_getc (void) +static int altera_serial_getc(void) { while (serial_tstc () == 0) WATCHDOG_RESET (); return (readl (&uart->rxdata) & 0x00ff ); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device altera_serial_drv = { + .name = "altera_serial", + .start = altera_serial_init, + .stop = NULL, + .setbrg = altera_serial_setbrg, + .putc = altera_serial_putc, + .puts = altera_serial_puts, + .getc = altera_serial_getc, + .tstc = altera_serial_tstc, +}; + +void altera_serial_initialize(void) +{ + serial_register(&altera_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &altera_serial_drv; +} +#else +int serial_init(void) +{ + return altera_serial_init(); +} + +void serial_setbrg(void) +{ + altera_serial_setbrg(); +} + +void serial_putc(const char c) +{ + altera_serial_putc(c); +} + +void serial_puts(const char *s) +{ + altera_serial_puts(s); +} + +int serial_getc(void) +{ + return altera_serial_getc(); +} + +int serial_tstc(void) +{ + return altera_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into atmel serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the atmel driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Xu, Hong Hong.Xu@atmel.com --- common/serial.c | 2 ++ drivers/serial/atmel_usart.c | 67 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/common/serial.c b/common/serial.c index e6566da..b880303 100644 --- a/common/serial.c +++ b/common/serial.c @@ -71,6 +71,7 @@ serial_initfunc(sconsole_serial_initialize); serial_initfunc(p3mx_serial_initialize); serial_initfunc(altera_jtag_serial_initialize); serial_initfunc(altera_serial_initialize); +serial_initfunc(atmel_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -120,6 +121,7 @@ void serial_initialize(void) p3mx_serial_initialize(); altera_jtag_serial_initialize(); altera_serial_initialize(); + atmel_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 943ef70..d49d5d4 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -20,6 +20,8 @@ */ #include <common.h> #include <watchdog.h> +#include <serial.h> +#include <linux/compiler.h>

#include <asm/io.h> #include <asm/arch/clk.h> @@ -29,7 +31,7 @@

DECLARE_GLOBAL_DATA_PTR;

-void serial_setbrg(void) +static void atmel_serial_setbrg(void) { atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; unsigned long divisor; @@ -45,7 +47,7 @@ void serial_setbrg(void) writel(USART3_BF(CD, divisor), &usart->brgr); }

-int serial_init(void) +static int atmel_serial_init(void) { atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;

@@ -73,7 +75,7 @@ int serial_init(void) return 0; }

-void serial_putc(char c) +static void atmel_serial_putc(char c) { atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;

@@ -84,13 +86,13 @@ void serial_putc(char c) writel(c, &usart->thr); }

-void serial_puts(const char *s) +static void atmel_serial_puts(const char *s) { while (*s) serial_putc(*s++); }

-int serial_getc(void) +static int atmel_serial_getc(void) { atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;

@@ -99,8 +101,61 @@ int serial_getc(void) return readl(&usart->rhr); }

-int serial_tstc(void) +static int atmel_serial_tstc(void) { atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; return (readl(&usart->csr) & USART3_BIT(RXRDY)) != 0; } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device atmel_serial_drv = { + .name = "atmel_serial", + .start = atmel_serial_init, + .stop = NULL, + .setbrg = atmel_serial_setbrg, + .putc = atmel_serial_putc, + .puts = atmel_serial_puts, + .getc = atmel_serial_getc, + .tstc = atmel_serial_tstc, +}; + +void atmel_serial_initialize(void) +{ + serial_register(&atmel_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &atmel_serial_drv; +} +#else +int serial_init(void) +{ + return atmel_serial_init(); +} + +void serial_setbrg(void) +{ + atmel_serial_setbrg(); +} + +void serial_putc(const char c) +{ + atmel_serial_putc(c); +} + +void serial_puts(const char *s) +{ + atmel_serial_puts(s); +} + +int serial_getc(void) +{ + return atmel_serial_getc(); +} + +int serial_tstc(void) +{ + return atmel_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into lpc32xx serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the lpc32xx driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Vladimir Zapolskiy vz@mleia.com --- common/serial.c | 2 ++ drivers/serial/lpc32xx_hsuart.c | 71 ++++++++++++++++++++++++++------------- 2 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/common/serial.c b/common/serial.c index b880303..8bc26d8 100644 --- a/common/serial.c +++ b/common/serial.c @@ -72,6 +72,7 @@ serial_initfunc(p3mx_serial_initialize); serial_initfunc(altera_jtag_serial_initialize); serial_initfunc(altera_serial_initialize); serial_initfunc(atmel_serial_initialize); +serial_initfunc(lpc32xx_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -122,6 +123,7 @@ void serial_initialize(void) altera_jtag_serial_initialize(); altera_serial_initialize(); atmel_serial_initialize(); + lpc32xx_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 8ce3382..536fd46 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -22,12 +22,14 @@ #include <asm/arch/clk.h> #include <asm/arch/uart.h> #include <asm/io.h> +#include <serial.h> +#include <linux/compiler.h>

DECLARE_GLOBAL_DATA_PTR;

static struct hsuart_regs *hsuart = (struct hsuart_regs *)HS_UART_BASE;

-static void lpc32xx_hsuart_set_baudrate(void) +static void lpc32xx_serial_setbrg(void) { u32 div;

@@ -39,7 +41,7 @@ static void lpc32xx_hsuart_set_baudrate(void) writel(div, &hsuart->rate); }

-static int lpc32xx_hsuart_getc(void) +static int lpc32xx_serial_getc(void) { while (!(readl(&hsuart->level) & HSUART_LEVEL_RX)) /* NOP */; @@ -47,7 +49,7 @@ static int lpc32xx_hsuart_getc(void) return readl(&hsuart->rx) & HSUART_RX_DATA; }

-static void lpc32xx_hsuart_putc(const char c) +static void lpc32xx_serial_putc(const char c) { writel(c, &hsuart->tx);

@@ -56,7 +58,7 @@ static void lpc32xx_hsuart_putc(const char c) /* NOP */; }

-static int lpc32xx_hsuart_tstc(void) +static int lpc32xx_serial_tstc(void) { if (readl(&hsuart->level) & HSUART_LEVEL_RX) return 1; @@ -64,49 +66,72 @@ static int lpc32xx_hsuart_tstc(void) return 0; }

-static void lpc32xx_hsuart_init(void) +static int lpc32xx_serial_init(void) { - lpc32xx_hsuart_set_baudrate(); + lpc32xx_serial_setbrg();

/* Disable hardware RTS and CTS flow control, set up RX and TX FIFO */ writel(HSUART_CTRL_TMO_16 | HSUART_CTRL_HSU_OFFSET(20) | HSUART_CTRL_HSU_RX_TRIG_32 | HSUART_CTRL_HSU_TX_TRIG_0, &hsuart->ctrl); + return 0; }

-void serial_setbrg(void) +static void lpc32xx_serial_puts(const char *s) { - return lpc32xx_hsuart_set_baudrate(); + while (*s) + serial_putc(*s++); }

-void serial_putc(const char c) +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device lpc32xx_serial_drv = { + .name = "lpc32xx_serial", + .start = lpc32xx_serial_init, + .stop = NULL, + .setbrg = lpc32xx_serial_setbrg, + .putc = lpc32xx_serial_putc, + .puts = lpc32xx_serial_puts, + .getc = lpc32xx_serial_getc, + .tstc = lpc32xx_serial_tstc, +}; + +void lpc32xx_serial_initialize(void) { - lpc32xx_hsuart_putc(c); + serial_register(&lpc32xx_serial_drv); +}

- /* If \n, also do \r */ - if (c == '\n') - lpc32xx_hsuart_putc('\r'); +__weak struct serial_device *default_serial_console(void) +{ + return &lpc32xx_serial_drv; +} +#else +int serial_init(void) +{ + return lpc32xx_serial_init(); }

-int serial_getc(void) +void serial_setbrg(void) { - return lpc32xx_hsuart_getc(); + lpc32xx_serial_setbrg(); }

-void serial_puts(const char *s) +void serial_putc(const char c) { - while (*s) - serial_putc(*s++); + lpc32xx_serial_putc(c); }

-int serial_tstc(void) +void serial_puts(const char *s) { - return lpc32xx_hsuart_tstc(); + lpc32xx_serial_puts(s); }

-int serial_init(void) +int serial_getc(void) { - lpc32xx_hsuart_init(); + return lpc32xx_serial_getc(); +}

- return 0; +int serial_tstc(void) +{ + return lpc32xx_serial_tstc(); } +#endif

Implement support for CONFIG_SERIAL_MULTI into MCF serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the MCF driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: TsiChung Liew tsicliew@gmail.com --- common/serial.c | 2 ++ drivers/serial/mcfuart.c | 65 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 8bc26d8..fa16dce 100644 --- a/common/serial.c +++ b/common/serial.c @@ -73,6 +73,7 @@ serial_initfunc(altera_jtag_serial_initialize); serial_initfunc(altera_serial_initialize); serial_initfunc(atmel_serial_initialize); serial_initfunc(lpc32xx_serial_initialize); +serial_initfunc(mcf_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -124,6 +125,7 @@ void serial_initialize(void) altera_serial_initialize(); atmel_serial_initialize(); lpc32xx_serial_initialize(); + mcf_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index d93b24b..7e0b765 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -36,7 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;

extern void uart_port_conf(int port);

-int serial_init(void) +static int mcf_serial_init(void) { volatile uart_t *uart; u32 counter; @@ -74,7 +74,7 @@ int serial_init(void) return (0); }

-void serial_putc(const char c) +static void mcf_serial_putc(const char c) { volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE);

@@ -87,14 +87,14 @@ void serial_putc(const char c) uart->utb = c; }

-void serial_puts(const char *s) +static void mcf_serial_puts(const char *s) { while (*s) { serial_putc(*s++); } }

-int serial_getc(void) +static int mcf_serial_getc(void) { volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE);

@@ -103,14 +103,14 @@ int serial_getc(void) return uart->urb; }

-int serial_tstc(void) +static int mcf_serial_tstc(void) { volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE);

return (uart->usr & UART_USR_RXRDY); }

-void serial_setbrg(void) +static void mcf_serial_setbrg(void) { volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE); u32 counter; @@ -129,3 +129,56 @@ void serial_setbrg(void)

uart->ucr = UART_UCR_RX_ENABLED | UART_UCR_TX_ENABLED; } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device mcf_serial_drv = { + .name = "mcf_serial", + .start = mcf_serial_init, + .stop = NULL, + .setbrg = mcf_serial_setbrg, + .putc = mcf_serial_putc, + .puts = mcf_serial_puts, + .getc = mcf_serial_getc, + .tstc = mcf_serial_tstc, +}; + +void mcf_serial_initialize(void) +{ + serial_register(&mcf_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &mcf_serial_drv; +} +#else +int serial_init(void) +{ + return mcf_serial_init(); +} + +void serial_setbrg(void) +{ + mcf_serial_setbrg(); +} + +void serial_putc(const char c) +{ + mcf_serial_putc(c); +} + +void serial_puts(const char *s) +{ + mcf_serial_puts(s); +} + +int serial_getc(void) +{ + return mcf_serial_getc(); +} + +int serial_tstc(void) +{ + return mcf_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into OpenCores serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the OpenCores driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Scott McNutt smcnutt@psyent.com --- common/serial.c | 2 ++ drivers/serial/opencores_yanu.c | 67 +++++++++++++++++++++++++++++++++++---- 2 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/common/serial.c b/common/serial.c index c6a275d..f217093 100644 --- a/common/serial.c +++ b/common/serial.c @@ -75,6 +75,7 @@ serial_initfunc(atmel_serial_initialize); serial_initfunc(lpc32xx_serial_initialize); serial_initfunc(mcf_serial_initialize); serial_initfunc(ns9750_serial_initialize); +serial_initfunc(oc_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -128,6 +129,7 @@ void serial_initialize(void) lpc32xx_serial_initialize(); mcf_serial_initialize(); ns9750_serial_initialize(); + oc_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/opencores_yanu.c b/drivers/serial/opencores_yanu.c index f383011..a0dd301 100644 --- a/drivers/serial/opencores_yanu.c +++ b/drivers/serial/opencores_yanu.c @@ -37,7 +37,7 @@ static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE;

/* Everything's already setup for fixed-baud PTF assignment*/

-void serial_setbrg (void) +static void oc_serial_setbrg(void) { int n, k; const unsigned max_uns = 0xFFFFFFFF; @@ -68,7 +68,7 @@ void serial_setbrg (void)

#else

-void serial_setbrg (void) +static void oc_serial_setbrg(void) { int n, k; const unsigned max_uns = 0xFFFFFFFF; @@ -100,7 +100,7 @@ void serial_setbrg (void)

#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */

-int serial_init (void) +static int oc_serial_init(void) { unsigned action,control;

@@ -141,7 +141,7 @@ int serial_init (void) /*----------------------------------------------------------------------- * YANU CONSOLE *---------------------------------------------------------------------*/ -void serial_putc (char c) +static void oc_serial_putc(char c) { int tx_chars; unsigned status; @@ -161,7 +161,7 @@ void serial_putc (char c) writel((unsigned char)c, &uart->data); }

-void serial_puts (const char *s) +static void oc_serial_puts(const char *s) { while (*s != 0) { serial_putc (*s++); @@ -169,7 +169,7 @@ void serial_puts (const char *s) }

-int serial_tstc(void) +static int oc_serial_tstc(void) { unsigned status ;

@@ -178,7 +178,7 @@ int serial_tstc(void) ((1 << YANU_RFIFO_CHARS_N) - 1)) > 0); }

-int serial_getc (void) +statoc int oc_serial_getc(void) { while (serial_tstc() == 0) WATCHDOG_RESET (); @@ -188,3 +188,56 @@ int serial_getc (void)

return(readl(&uart->data) & YANU_DATA_CHAR_MASK); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device oc_serial_drv = { + .name = "oc_serial", + .start = oc_serial_init, + .stop = NULL, + .setbrg = oc_serial_setbrg, + .putc = oc_serial_putc, + .puts = oc_serial_puts, + .getc = oc_serial_getc, + .tstc = oc_serial_tstc, +}; + +void oc_serial_initialize(void) +{ + serial_register(&oc_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &oc_serial_drv; +} +#else +int serial_init(void) +{ + return oc_serial_init(); +} + +void serial_setbrg(void) +{ + oc_serial_setbrg(); +} + +void serial_putc(const char c) +{ + oc_serial_putc(c); +} + +void serial_puts(const char *s) +{ + oc_serial_puts(s); +} + +int serial_getc(void) +{ + return oc_serial_getc(); +} + +int serial_tstc(void) +{ + return oc_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into s3c64xx serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the s3c64xx driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: John Rigby john.rigby@linaro.org Cc: Minkyu Kang mk7.kang@samsung.com --- common/serial.c | 2 ++ drivers/serial/s3c64xx.c | 65 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/common/serial.c b/common/serial.c index d0a20e9..93d6a08 100644 --- a/common/serial.c +++ b/common/serial.c @@ -77,6 +77,7 @@ serial_initfunc(mcf_serial_initialize); serial_initfunc(ns9750_serial_initialize); serial_initfunc(oc_serial_initialize); serial_initfunc(s3c4510b_serial_initialize); +serial_initfunc(s3c64xx_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -132,6 +133,7 @@ void serial_initialize(void) ns9750_serial_initialize(); oc_serial_initialize(); s3c4510b_serial_initialize(); + s3c64xx_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/s3c64xx.c b/drivers/serial/s3c64xx.c index a88e930..823425b 100644 --- a/drivers/serial/s3c64xx.c +++ b/drivers/serial/s3c64xx.c @@ -68,7 +68,7 @@ static const int udivslot[] = { 0xffdf, };

-void serial_setbrg(void) +static void s3c64xx_serial_setbrg(void) { s3c64xx_uart *const uart = s3c64xx_get_base_uart(UART_NR); u32 pclk = get_PCLK(); @@ -88,7 +88,7 @@ void serial_setbrg(void) * Initialise the serial port with the given baudrate. The settings * are always 8 data bits, no parity, 1 stop bit, no start bits. */ -int serial_init(void) +static int s3c64xx_serial_init(void) { s3c64xx_uart *const uart = s3c64xx_get_base_uart(UART_NR);

@@ -110,7 +110,7 @@ int serial_init(void) * otherwise. When the function is succesfull, the character read is * written into its argument c. */ -int serial_getc(void) +static int s3c64xx_serial_getc(void) { s3c64xx_uart *const uart = s3c64xx_get_base_uart(UART_NR);

@@ -137,7 +137,7 @@ void enable_putc(void) /* * Output a single byte to the serial port. */ -void serial_putc(const char c) +static void s3c64xx_serial_putc(const char c) { s3c64xx_uart *const uart = s3c64xx_get_base_uart(UART_NR);

@@ -159,15 +159,68 @@ void serial_putc(const char c) /* * Test whether a character is in the RX buffer */ -int serial_tstc(void) +static int s3c64xx_serial_tstc(void) { s3c64xx_uart *const uart = s3c64xx_get_base_uart(UART_NR);

return uart->UTRSTAT & 0x1; }

-void serial_puts(const char *s) +static void s3c64xx_serial_puts(const char *s) { while (*s) serial_putc(*s++); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device s3c64xx_serial_drv = { + .name = "s3c64xx_serial", + .start = s3c64xx_serial_init, + .stop = NULL, + .setbrg = s3c64xx_serial_setbrg, + .putc = s3c64xx_serial_putc, + .puts = s3c64xx_serial_puts, + .getc = s3c64xx_serial_getc, + .tstc = s3c64xx_serial_tstc, +}; + +void s3c64xx_serial_initialize(void) +{ + serial_register(&s3c64xx_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &s3c64xx_serial_drv; +} +#else +int serial_init(void) +{ + return s3c64xx_serial_init(); +} + +void serial_setbrg(void) +{ + s3c64xx_serial_setbrg(); +} + +void serial_putc(const char c) +{ + s3c64xx_serial_putc(c); +} + +void serial_puts(const char *s) +{ + s3c64xx_serial_puts(s); +} + +int serial_getc(void) +{ + return s3c64xx_serial_getc(); +} + +int serial_tstc(void) +{ + return s3c64xx_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into sandbox serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the sandbox driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Mike Frysinger vapier@gentoo.org --- common/serial.c | 2 ++ drivers/serial/sandbox.c | 67 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 93d6a08..a7a3234 100644 --- a/common/serial.c +++ b/common/serial.c @@ -78,6 +78,7 @@ serial_initfunc(ns9750_serial_initialize); serial_initfunc(oc_serial_initialize); serial_initfunc(s3c4510b_serial_initialize); serial_initfunc(s3c64xx_serial_initialize); +serial_initfunc(sandbox_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -134,6 +135,7 @@ void serial_initialize(void) oc_serial_initialize(); s3c4510b_serial_initialize(); s3c64xx_serial_initialize(); + sandbox_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 1927c16..d60fbba 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -27,28 +27,30 @@

#include <common.h> #include <os.h> +#include <serial.h> +#include <linux/compiler.h>

-int serial_init(void) +static int sandbox_serial_init(void) { os_tty_raw(0); return 0; }

-void serial_setbrg(void) +static void sandbox_serial_setbrg(void) { }

-void serial_putc(const char ch) +static void sandbox_serial_putc(const char ch) { os_write(1, &ch, 1); }

-void serial_puts(const char *str) +static void sandbox_serial_puts(const char *str) { os_write(1, str, strlen(str)); }

-int serial_getc(void) +static int sandbox_serial_getc(void) { char buf; ssize_t count; @@ -57,7 +59,60 @@ int serial_getc(void) return count == 1 ? buf : 0; }

-int serial_tstc(void) +static int sandbox_serial_tstc(void) { return 0; } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device sandbox_serial_drv = { + .name = "sandbox_serial", + .start = sandbox_serial_init, + .stop = NULL, + .setbrg = sandbox_serial_setbrg, + .putc = sandbox_serial_putc, + .puts = sandbox_serial_puts, + .getc = sandbox_serial_getc, + .tstc = sandbox_serial_tstc, +}; + +void sandbox_serial_initialize(void) +{ + serial_register(&sandbox_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &sandbox_serial_drv; +} +#else +int serial_init(void) +{ + return sandbox_serial_init(); +} + +void serial_setbrg(void) +{ + sandbox_serial_setbrg(); +} + +void serial_putc(const char c) +{ + sandbox_serial_putc(c); +} + +void serial_puts(const char *s) +{ + sandbox_serial_puts(s); +} + +int serial_getc(void) +{ + return sandbox_serial_getc(); +} + +int serial_tstc(void) +{ + return sandbox_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into imx serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the imx driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Stefano Babic sbabic@denx.de --- common/serial.c | 2 ++ drivers/serial/serial_imx.c | 68 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 4471262..cb8eacf 100644 --- a/common/serial.c +++ b/common/serial.c @@ -80,6 +80,7 @@ serial_initfunc(s3c4510b_serial_initialize); serial_initfunc(s3c64xx_serial_initialize); serial_initfunc(sandbox_serial_initialize); serial_initfunc(clps7111_serial_initialize); +serial_initfunc(imx_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -138,6 +139,7 @@ void serial_initialize(void) s3c64xx_serial_initialize(); sandbox_serial_initialize(); clps7111_serial_initialize(); + imx_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index b9ca748..d37ec29 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -19,6 +19,8 @@

#include <common.h> #include <asm/arch/imx-regs.h> +#include <serial.h> +#include <linux/compiler.h>

#if defined CONFIG_IMX_SERIAL1 #define UART_BASE IMX_UART1_BASE @@ -50,7 +52,7 @@ struct imx_serial {

DECLARE_GLOBAL_DATA_PTR;

-void serial_setbrg (void) +static void imx_serial_setbrg(void) { serial_init(); } @@ -62,7 +64,7 @@ extern void imx_gpio_mode(int gpio_mode); * are always 8 data bits, no parity, 1 stop bit, no start bits. * */ -int serial_init (void) +static int imx_serial_init(void) { volatile struct imx_serial* base = (struct imx_serial *)UART_BASE; unsigned int ufcr_rfdiv; @@ -163,7 +165,7 @@ int serial_init (void) * otherwise. When the function is successful, the character read is * written into its argument c. */ -int serial_getc (void) +static int imx_serial_getc(void) { volatile struct imx_serial* base = (struct imx_serial *)UART_BASE; unsigned char ch; @@ -185,7 +187,7 @@ int hwflow_onoff(int on) /* * Output a single byte to the serial port. */ -void serial_putc (const char c) +static void imx_serial_putc(const char c) { volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;

@@ -202,7 +204,7 @@ void serial_putc (const char c) /* * Test whether a character is in the RX buffer */ -int serial_tstc (void) +static int imx_serial_tstc(void) { volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;

@@ -212,10 +214,62 @@ int serial_tstc (void) return 1; }

-void -serial_puts (const char *s) +static void imx_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device imx_serial_drv = { + .name = "imx_serial", + .start = imx_serial_init, + .stop = NULL, + .setbrg = imx_serial_setbrg, + .putc = imx_serial_putc, + .puts = imx_serial_puts, + .getc = imx_serial_getc, + .tstc = imx_serial_tstc, +}; + +void imx_serial_initialize(void) +{ + serial_register(&imx_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &imx_serial_drv; +} +#else +int serial_init(void) +{ + return imx_serial_init(); +} + +void serial_setbrg(void) +{ + imx_serial_setbrg(); +} + +void serial_putc(const char c) +{ + imx_serial_putc(c); +} + +void serial_puts(const char *s) +{ + imx_serial_puts(s); +} + +int serial_getc(void) +{ + return imx_serial_getc(); +} + +int serial_tstc(void) +{ + return imx_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into ks8695 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the ks8695 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com --- common/serial.c | 2 ++ drivers/serial/serial_ks8695.c | 73 +++++++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 3d8fa7f..21c8ac3 100644 --- a/common/serial.c +++ b/common/serial.c @@ -82,6 +82,7 @@ serial_initfunc(sandbox_serial_initialize); serial_initfunc(clps7111_serial_initialize); serial_initfunc(imx_serial_initialize); serial_initfunc(ixp_serial_initialize); +serial_initfunc(ks8695_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -142,6 +143,7 @@ void serial_initialize(void) clps7111_serial_initialize(); imx_serial_initialize(); ixp_serial_initialize(); + ks8695_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c index aacd1be..b3af388 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/serial/serial_ks8695.c @@ -20,6 +20,8 @@

#include <common.h> #include <asm/arch/platform.h> +#include <serial.h> +#include <linux/compiler.h>

#ifndef CONFIG_SERIAL1 #error "Bad: you didn't configure serial ..." @@ -54,7 +56,7 @@ struct ks8695uart { int serial_console = 1;

-void serial_setbrg(void) +static void ks8695_serial_setbrg(void) { volatile struct ks8695uart *uartp = KS8695_UART_ADDR;

@@ -63,14 +65,14 @@ void serial_setbrg(void) uartp->LCR = KS8695_UART_LINEC_WLEN8; }

-int serial_init(void) +static int ks8695_serial_init(void) { serial_console = 1; serial_setbrg(); return 0; }

-void serial_raw_putc(const char c) +static void ks8695_serial_raw_putc(const char c) { volatile struct ks8695uart *uartp = KS8695_UART_ADDR; int i; @@ -83,16 +85,16 @@ void serial_raw_putc(const char c) uartp->TX = c; }

-void serial_putc(const char c) +static void ks8695_serial_putc(const char c) { if (serial_console) { - serial_raw_putc(c); + ks8695_serial_raw_putc(c); if (c == '\n') - serial_raw_putc('\r'); + ks8695_serial_raw_putc('\r'); } }

-int serial_tstc(void) +static int ks8695_serial_tstc(void) { volatile struct ks8695uart *uartp = KS8695_UART_ADDR; if (serial_console) @@ -100,14 +102,14 @@ int serial_tstc(void) return 0; }

-void serial_puts(const char *s) +static void ks8695_serial_puts(const char *s) { char c; while ((c = *s++) != 0) serial_putc(c); }

-int serial_getc(void) +static int ks8695_serial_getc(void) { volatile struct ks8695uart *uartp = KS8695_UART_ADDR;

@@ -115,3 +117,56 @@ int serial_getc(void) ; return (uartp->RX); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device ks8695_serial_drv = { + .name = "ks8695_serial", + .start = ks8695_serial_init, + .stop = NULL, + .setbrg = ks8695_serial_setbrg, + .putc = ks8695_serial_putc, + .puts = ks8695_serial_puts, + .getc = ks8695_serial_getc, + .tstc = ks8695_serial_tstc, +}; + +void ks8695_serial_initialize(void) +{ + serial_register(&ks8695_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &ks8695_serial_drv; +} +#else +int serial_init(void) +{ + return ks8695_serial_init(); +} + +void serial_setbrg(void) +{ + ks8695_serial_setbrg(); +} + +void serial_putc(const char c) +{ + ks8695_serial_putc(c); +} + +void serial_puts(const char *s) +{ + ks8695_serial_puts(s); +} + +int serial_getc(void) +{ + return ks8695_serial_getc(); +} + +int serial_tstc(void) +{ + return ks8695_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into lpc2292 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the lpc2292 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com --- common/serial.c | 2 ++ drivers/serial/serial_lpc2292.c | 66 ++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 59a8650..23c8d22 100644 --- a/common/serial.c +++ b/common/serial.c @@ -84,6 +84,7 @@ serial_initfunc(imx_serial_initialize); serial_initfunc(ixp_serial_initialize); serial_initfunc(ks8695_serial_initialize); serial_initfunc(lh7a40x_serial_initialize); +serial_initfunc(lpc2292_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -146,6 +147,7 @@ void serial_initialize(void) ixp_serial_initialize(); ks8695_serial_initialize(); lh7a40x_serial_initialize(); + lpc2292_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c index e3a60b6..2601ee7 100644 --- a/drivers/serial/serial_lpc2292.c +++ b/drivers/serial/serial_lpc2292.c @@ -33,7 +33,7 @@

DECLARE_GLOBAL_DATA_PTR;

-void serial_setbrg (void) +static void lpc2292_serial_setbrg(void) { unsigned short divisor = 0;

@@ -57,7 +57,7 @@ void serial_setbrg (void) PUT8(U0FCR, 1); /* Enable RX and TX FIFOs */ }

-int serial_init (void) +static int lpc2292_serial_init(void) { unsigned long pinsel0;

@@ -71,7 +71,7 @@ int serial_init (void) return (0); }

-void serial_putc (const char c) +static void lpc2292_serial_putc(const char c) { if (c == '\n') { @@ -83,14 +83,13 @@ void serial_putc (const char c) PUT8(U0THR, c); }

-int serial_getc (void) +static int lpc2292_serial_getc(void) { while((GET8(U0LSR) & 1) == 0); return GET8(U0RBR); }

-void -serial_puts (const char *s) +static void lpc2292_serial_puts(const char *s) { while (*s) { serial_putc (*s++); @@ -98,7 +97,60 @@ serial_puts (const char *s) }

/* Test if there is a byte to read */ -int serial_tstc (void) +static int lpc2292_serial_tstc(void) { return (GET8(U0LSR) & 1); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device lpc2292_serial_drv = { + .name = "lpc2292_serial", + .start = lpc2292_serial_init, + .stop = NULL, + .setbrg = lpc2292_serial_setbrg, + .putc = lpc2292_serial_putc, + .puts = lpc2292_serial_puts, + .getc = lpc2292_serial_getc, + .tstc = lpc2292_serial_tstc, +}; + +void lpc2292_serial_initialize(void) +{ + serial_register(&lpc2292_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &lpc2292_serial_drv; +} +#else +int serial_init(void) +{ + return lpc2292_serial_init(); +} + +void serial_setbrg(void) +{ + lpc2292_serial_setbrg(); +} + +void serial_putc(const char c) +{ + lpc2292_serial_putc(c); +} + +void serial_puts(const char *s) +{ + lpc2292_serial_puts(s); +} + +int serial_getc(void) +{ + return lpc2292_serial_getc(); +} + +int serial_tstc(void) +{ + return lpc2292_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into mxc serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the mxc driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Stefano Babic sbabic@denx.de --- common/serial.c | 2 ++ drivers/serial/serial_mxc.c | 68 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/common/serial.c b/common/serial.c index f007d13..566a3cc 100644 --- a/common/serial.c +++ b/common/serial.c @@ -86,6 +86,7 @@ serial_initfunc(ks8695_serial_initialize); serial_initfunc(lh7a40x_serial_initialize); serial_initfunc(lpc2292_serial_initialize); serial_initfunc(max3100_serial_initialize); +serial_initfunc(mxc_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -150,6 +151,7 @@ void serial_initialize(void) lh7a40x_serial_initialize(); lpc2292_serial_initialize(); max3100_serial_initialize(); + mxc_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index af00b9c..0899e9b 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -21,6 +21,8 @@ #include <watchdog.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> +#include <serial.h> +#include <linux/compiler.h>

#define __REG(x) (*((volatile u32 *)(x)))

@@ -145,7 +147,7 @@

DECLARE_GLOBAL_DATA_PTR;

-void serial_setbrg (void) +static void mxc_serial_setbrg(void) { u32 clk = imx_get_uartclk();

@@ -158,14 +160,14 @@ void serial_setbrg (void)

}

-int serial_getc (void) +static int mxc_serial_getc(void) { while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY) WATCHDOG_RESET(); return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status from upper word */ }

-void serial_putc (const char c) +static void mxc_serial_putc(const char c) { __REG(UART_PHYS + UTXD) = c;

@@ -181,7 +183,7 @@ void serial_putc (const char c) /* * Test whether a character is in the RX buffer */ -int serial_tstc (void) +static int mxc_serial_tstc(void) { /* If receive fifo is empty, return false */ if (__REG(UART_PHYS + UTS) & UTS_RXEMPTY) @@ -189,8 +191,7 @@ int serial_tstc (void) return 1; }

-void -serial_puts (const char *s) +static void mxc_serial_puts(const char *s) { while (*s) { serial_putc (*s++); @@ -202,7 +203,7 @@ serial_puts (const char *s) * are always 8 data bits, no parity, 1 stop bit, no start bits. * */ -int serial_init (void) +static int mxc_serial_init(void) { __REG(UART_PHYS + UCR1) = 0x0; __REG(UART_PHYS + UCR2) = 0x0; @@ -224,3 +225,56 @@ int serial_init (void)

return 0; } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device mxc_serial_drv = { + .name = "mxc_serial", + .start = mxc_serial_init, + .stop = NULL, + .setbrg = mxc_serial_setbrg, + .putc = mxc_serial_putc, + .puts = mxc_serial_puts, + .getc = mxc_serial_getc, + .tstc = mxc_serial_tstc, +}; + +void mxc_serial_initialize(void) +{ + serial_register(&mxc_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &mxc_serial_drv; +} +#else +int serial_init(void) +{ + return mxc_serial_init(); +} + +void serial_setbrg(void) +{ + mxc_serial_setbrg(); +} + +void serial_putc(const char c) +{ + mxc_serial_putc(c); +} + +void serial_puts(const char *s) +{ + mxc_serial_puts(s); +} + +int serial_getc(void) +{ + return mxc_serial_getc(); +} + +int serial_tstc(void) +{ + return mxc_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into pl01x serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the pl01x driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Stefano Babic sbabic@denx.de Cc: Mathieu J. Poirier mathieu.poirier@linaro.org Cc: Linus Walleij linus.walleij@linaro.org Cc: John Rigby john.rigby@linaro.org Cc: Rabin Vincent rabin.vincent@stericsson.com --- common/serial.c | 2 ++ drivers/serial/serial_pl01x.c | 69 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/common/serial.c b/common/serial.c index c033cf0..48e6044 100644 --- a/common/serial.c +++ b/common/serial.c @@ -88,6 +88,7 @@ serial_initfunc(lpc2292_serial_initialize); serial_initfunc(max3100_serial_initialize); serial_initfunc(mxc_serial_initialize); serial_initfunc(netarm_serial_initialize); +serial_initfunc(pl01x_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -154,6 +155,7 @@ void serial_initialize(void) max3100_serial_initialize(); mxc_serial_initialize(); netarm_serial_initialize(); + pl01x_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index d4c5137..beb0c98 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -30,6 +30,8 @@ #include <common.h> #include <watchdog.h> #include <asm/io.h> +#include <serial.h> +#include <linux/compiler.h> #include "serial_pl01x.h"

/* @@ -54,7 +56,7 @@ static struct pl01x_regs *pl01x_get_regs(int portnum)

#ifdef CONFIG_PL010_SERIAL

-int serial_init (void) +static int pl01x_serial_init(void) { struct pl01x_regs *regs = pl01x_get_regs(CONSOLE_PORT); unsigned int divisor; @@ -104,7 +106,7 @@ int serial_init (void)

#ifdef CONFIG_PL011_SERIAL

-int serial_init (void) +static int pl01x_serial_init(void) { struct pl01x_regs *regs = pl01x_get_regs(CONSOLE_PORT); unsigned int temp; @@ -169,7 +171,7 @@ int serial_init (void)

#endif /* CONFIG_PL011_SERIAL */

-void serial_putc (const char c) +static void pl01x_serial_putc(const char c) { if (c == '\n') pl01x_putc (CONSOLE_PORT, '\r'); @@ -177,24 +179,24 @@ void serial_putc (const char c) pl01x_putc (CONSOLE_PORT, c); }

-void serial_puts (const char *s) +static void pl01x_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } }

-int serial_getc (void) +static int pl01x_serial_getc(void) { return pl01x_getc (CONSOLE_PORT); }

-int serial_tstc (void) +static int pl01x_serial_tstc(void) { return pl01x_tstc (CONSOLE_PORT); }

-void serial_setbrg (void) +static void pl01x_serial_setbrg(void) { struct pl01x_regs *regs = pl01x_get_regs(CONSOLE_PORT);

@@ -250,3 +252,56 @@ static int pl01x_tstc (int portnum) WATCHDOG_RESET(); return !(readl(&regs->fr) & UART_PL01x_FR_RXFE); } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device pl01x_serial_drv = { + .name = "pl01x_serial", + .start = pl01x_serial_init, + .stop = NULL, + .setbrg = pl01x_serial_setbrg, + .putc = pl01x_serial_putc, + .puts = pl01x_serial_puts, + .getc = pl01x_serial_getc, + .tstc = pl01x_serial_tstc, +}; + +void pl01x_serial_initialize(void) +{ + serial_register(&pl01x_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &pl01x_serial_drv; +} +#else +int serial_init(void) +{ + return pl01x_serial_init(); +} + +void serial_setbrg(void) +{ + pl01x_serial_setbrg(); +} + +void serial_putc(const char c) +{ + pl01x_serial_putc(c); +} + +void serial_puts(const char *s) +{ + pl01x_serial_puts(s); +} + +int serial_getc(void) +{ + return pl01x_serial_getc(); +} + +int serial_tstc(void) +{ + return pl01x_serial_tstc(); +} +#endif

Implement support for CONFIG_SERIAL_MULTI into sa1100 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the sa1100 driver. Also, add a weak implementation of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com --- common/serial.c | 2 ++ drivers/serial/serial_sa1100.c | 68 +++++++++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/common/serial.c b/common/serial.c index 1953aaf..3dae01b 100644 --- a/common/serial.c +++ b/common/serial.c @@ -90,6 +90,7 @@ serial_initfunc(mxc_serial_initialize); serial_initfunc(netarm_serial_initialize); serial_initfunc(pl01x_serial_initialize); serial_initfunc(s3c44b0_serial_initialize); +serial_initfunc(sa1100_serial_initialize);

void serial_register(struct serial_device *dev) { @@ -158,6 +159,7 @@ void serial_initialize(void) netarm_serial_initialize(); pl01x_serial_initialize(); s3c44b0_serial_initialize(); + sa1100_serial_initialize();

serial_assign(default_serial_console()->name); } diff --git a/drivers/serial/serial_sa1100.c b/drivers/serial/serial_sa1100.c index 5d18875..86e682d 100644 --- a/drivers/serial/serial_sa1100.c +++ b/drivers/serial/serial_sa1100.c @@ -30,10 +30,12 @@

#include <common.h> #include <SA-1100.h> +#include <serial.h> +#include <linux/compiler.h>

DECLARE_GLOBAL_DATA_PTR;

-void serial_setbrg (void) +static void sa1100_serial_setbrg(void) { unsigned int reg = 0;

@@ -89,7 +91,7 @@ void serial_setbrg (void) * are always 8 data bits, no parity, 1 stop bit, no start bits. * */ -int serial_init (void) +static int sa1100_serial_init(void) { serial_setbrg ();

@@ -100,7 +102,7 @@ int serial_init (void) /* * Output a single byte to the serial port. */ -void serial_putc (const char c) +static void sa1100_serial_putc(const char c) { #ifdef CONFIG_SERIAL1 /* wait for room in the tx FIFO on SERIAL1 */ @@ -124,7 +126,7 @@ void serial_putc (const char c) * otherwise. When the function is succesfull, the character read is * written into its argument c. */ -int serial_tstc (void) +static int sa1100_serial_tstc(void) { #ifdef CONFIG_SERIAL1 return Ser1UTSR1 & UTSR1_RNE; @@ -138,7 +140,7 @@ int serial_tstc (void) * otherwise. When the function is succesfull, the character read is * written into its argument c. */ -int serial_getc (void) +static int sa1100_serial_getc(void) { #ifdef CONFIG_SERIAL1 while (!(Ser1UTSR1 & UTSR1_RNE)); @@ -151,10 +153,62 @@ int serial_getc (void) #endif }

-void -serial_puts (const char *s) +static void sa1100_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device sa1100_serial_drv = { + .name = "sa1100_serial", + .start = sa1100_serial_init, + .stop = NULL, + .setbrg = sa1100_serial_setbrg, + .putc = sa1100_serial_putc, + .puts = sa1100_serial_puts, + .getc = sa1100_serial_getc, + .tstc = sa1100_serial_tstc, +}; + +void sa1100_serial_initialize(void) +{ + serial_register(&sa1100_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &sa1100_serial_drv; +} +#else +int serial_init(void) +{ + return sa1100_serial_init(); +} + +void serial_setbrg(void) +{ + sa1100_serial_setbrg(); +} + +void serial_putc(const char c) +{ + sa1100_serial_putc(c); +} + +void serial_puts(const char *s) +{ + sa1100_serial_puts(s); +} + +int serial_getc(void) +{ + return sa1100_serial_getc(); +} + +int serial_tstc(void) +{ + return sa1100_serial_tstc(); +} +#endif

Remove the empty bodies from serial_* functions from MXS SPL code. These empty implementations are now in common/serial.c instead so declaring them also in the SPL code would cause a colision once serial multi is enabled unconditionally.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Stefano Babic sbabic@denx.de --- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index ddafddb..51b8625 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -122,10 +122,6 @@ inline void board_init_r(gd_t *id, ulong dest_addr) ; }

-#ifndef CONFIG_SPL_SERIAL_SUPPORT -void serial_putc(const char c) {} -void serial_puts(const char *s) {} -#endif void hang(void) __attribute__ ((noreturn)); void hang(void) {

If case the get_current() call fails before relocation, the U-Boot must try to print an error message, fail and either reset or halt. Such error is critical enough to halt the system, as it means the system is in very bad state.

This is now also used in SPL, since CONFIG_SERIAL_MULTI is enabled unconditionally. To avoid compiling whole vsprintf.c into SPL, use puts() to print error message and hang() to stop the system in case of SPL build.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com --- common/serial.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/serial.c b/common/serial.c index cef4ba8..8e0d8a1 100644 --- a/common/serial.c +++ b/common/serial.c @@ -230,8 +230,14 @@ static struct serial_device *get_current(void) dev = default_serial_console();

/* We must have a console device */ - if (!dev) - panic("Cannot find console"); + if (!dev) { +#ifdef CONFIG_SPL_BUILD + puts("Cannot find console\n"); + hang(); +#else + panic("Cannot find console\n"); +#endif + } } else dev = serial_current; return dev;

Remove any notion of CONFIG_SERIAL_MULTI from board config files. Since CONFIG_SERIAL_MULTI is now enabled by default, it is useless to specify this config option in the board config files. Therefore remove it.

Signed-off-by: Marek Vasut marex@denx.de Cc: Marek Vasut marek.vasut@gmail.com Cc: Tom Rini trini@ti.com Cc: Anatolij Gustschin agust@denx.de Cc: Stefan Roese sr@denx.de --- include/configs/DU440.h | 1 - include/configs/KAREF.h | 1 - include/configs/METROBOX.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1_P2_RDB.h | 1 - include/configs/P2020COME.h | 1 - include/configs/PMC440.h | 1 - include/configs/TB5200.h | 1 - include/configs/amcc-common.h | 1 - include/configs/bfin_adi_common.h | 1 - include/configs/coreboot.h | 1 - include/configs/eNET.h | 1 - include/configs/harmony.h | 1 - include/configs/jadecpu.h | 1 - include/configs/korat.h | 1 - include/configs/lwmon.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mcc200.h | 5 ----- include/configs/medcom.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/origen.h | 1 - include/configs/paz00.h | 1 - include/configs/pcs440ep.h | 1 - include/configs/pdm360ng.h | 3 --- include/configs/plutux.h | 1 - include/configs/quad100hd.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sc3.h | 1 - include/configs/seaboard.h | 1 - include/configs/smdk5250.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/tec.h | 1 - include/configs/tegra20-common-post.h | 5 ----- include/configs/trats.h | 1 - include/configs/trimslice.h | 1 - include/configs/trizepsiv.h | 1 - include/configs/ventana.h | 1 - include/configs/whistler.h | 1 - include/configs/zeus.h | 1 - 42 files changed, 52 deletions(-)

diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 8bd7940..bbe2713 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -93,7 +93,6 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() #undef CONFIG_SYS_EXT_SERIAL_CLOCK #define CONFIG_BAUDRATE 115200 -#define CONFIG_SERIAL_MULTI 1

#define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 3daf480..546e28b 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -96,7 +96,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_BAUDRATE 9600

#define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 34376bc..286f869 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -158,7 +158,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_BAUDRATE 9600

#define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index d973364..acd3276 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -274,7 +274,6 @@ extern unsigned long get_clock_freq(void);

/* Serial Port */ #define CONFIG_CONS_INDEX 1 -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 67dba9f..540f32d 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -453,7 +453,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_NS16550_MIN_FUNCTIONS #endif

-#define CONFIG_SERIAL_MULTI /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */

#define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index ab88166..9db0e87 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -343,7 +343,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_NS16550_MIN_FUNCTIONS #endif

-#define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */

#define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h index d323fb5..c75f86c 100644 --- a/include/configs/P2020COME.h +++ b/include/configs/P2020COME.h @@ -201,7 +201,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0)

-#define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */

#define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index b820954..3837b8f 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() #undef CONFIG_SYS_EXT_SERIAL_CLOCK #define CONFIG_BAUDRATE 115200 -#define CONFIG_SERIAL_MULTI 1

#define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index feaadf3..a624c83 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -56,7 +56,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* default console is on PSC1 */ -#define CONFIG_SERIAL_MULTI 1 /* support multiple consoles */ #define CONFIG_PSC_CONSOLE2 6 /* second console is on PSC6 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 056a22a..c9db47a 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -31,7 +31,6 @@ /* * UART */ -#define CONFIG_SERIAL_MULTI #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 7132f8f..b635c7d 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -108,7 +108,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_JTAG_CONSOLE #define CONFIG_SILENT_CONSOLE -#define CONFIG_SERIAL_MULTI #ifndef CONFIG_BAUDRATE # define CONFIG_BAUDRATE 57600 #endif diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 2c65d74..0e89242 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -54,7 +54,6 @@ /*----------------------------------------------------------------------- * Serial Configuration */ -#define CONFIG_SERIAL_MULTI #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/eNET.h b/include/configs/eNET.h index d5c9cad..4b1c219 100644 --- a/include/configs/eNET.h +++ b/include/configs/eNET.h @@ -55,7 +55,6 @@ /*----------------------------------------------------------------------- * Serial Configuration */ -#define CONFIG_SERIAL_MULTI #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/harmony.h b/include/configs/harmony.h index d0555c1..891c0e4 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -37,7 +37,6 @@ #define CONFIG_TEGRA20_BOARD_STRING "NVIDIA Harmony"

/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA20_ENABLE_UARTD

/* UARTD: keyboard satellite board UART, default */ diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h index 7b9d36d..daf37bf 100644 --- a/include/configs/jadecpu.h +++ b/include/configs/jadecpu.h @@ -68,7 +68,6 @@ /* * Serial */ -#define CONFIG_SERIAL_MULTI #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) diff --git a/include/configs/korat.h b/include/configs/korat.h index 46335b4..b919aec 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() #define CONFIG_SYS_EXT_SERIAL_CLOCK 11059200 /* ext. 11.059MHz clk */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SERIAL_MULTI 1

#define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 1d89176..ab86053 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -60,7 +60,6 @@ #define CONFIG_LCD_INFO 1 /* ... and some board info */ #define CONFIG_SPLASH_SCREEN /* ... with splashscreen support*/

-#define CONFIG_SERIAL_MULTI 1 #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #define CONFIG_8xx_CONS_SCC2 1 /* Console is on SCC2 */

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 497eec4..2d33ebc 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -121,7 +121,6 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() #undef CONFIG_SYS_EXT_SERIAL_CLOCK /* no external clock provided */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SERIAL_MULTI

#define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index 1867eb6..053e5bc 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -76,17 +76,12 @@ */ #if !defined(CONFIG_PRS200) /* MCC200 configuration: */ -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_PSC_CONSOLE 1 /* PSC1 may be COM */ #define CONFIG_PSC_CONSOLE2 2 /* PSC2 is PSoC */ #else /* PRS200 configuration: */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #endif -#if defined(CONFIG_QUART_CONSOLE) && defined(CONFIG_PSC_CONSOLE) && \ - !defined(CONFIG_SERIAL_MULTI) -#error "Select only one console device!" -#endif #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }

diff --git a/include/configs/medcom.h b/include/configs/medcom.h index bce03a4..12b8aef 100644 --- a/include/configs/medcom.h +++ b/include/configs/medcom.h @@ -38,7 +38,6 @@ #define CONFIG_TEGRA20_BOARD_STRING "Avionic Design Medcom"

/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA20_ENABLE_UARTD /* UARTD: debug UART */ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE

diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index a7cc5fc..d681424 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -76,7 +76,6 @@ * NS16550 Configuration * Zoom2 uses the TL16CP754C on the debug board */ -#define CONFIG_SERIAL_MULTI 1 /* * 0 - 1 : first USB with respect to the left edge of the debug board * 2 - 3 : second USB with respect to the left edge of the debug board diff --git a/include/configs/origen.h b/include/configs/origen.h index 1ab9834..ff2b24d 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))

/* select serial console configuration */ -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_SERIAL2 1 /* use SERIAL 2 */ #define CONFIG_BAUDRATE 115200 #define EXYNOS4_DEFAULT_UART_OFFSET 0x020000 diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 0eb9f3b..dc838c7 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -30,7 +30,6 @@ #define CONFIG_TEGRA20_BOARD_STRING "Compal Paz00"

/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA20_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE

diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 26627bb..351ff5a 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -88,7 +88,6 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() #undef CONFIG_SYS_EXT_SERIAL_CLOCK /* no external clk used */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SERIAL_MULTI 1

#define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 8afc3c0..671e9eb 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -298,7 +298,6 @@ /* * Used PSC UART devices */ -#define CONFIG_SERIAL_MULTI #define CONFIG_SYS_PSC1 #define CONFIG_SYS_PSC4 #define CONFIG_SYS_PSC6 @@ -434,10 +433,8 @@ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif

-#ifdef CONFIG_SERIAL_MULTI /* POST support */ #define CONFIG_POST (CONFIG_SYS_POST_COPROC) -#endif

/* * Environment Configuration diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 42291d4..46eb8cf 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -38,7 +38,6 @@ #define CONFIG_TEGRA20_BOARD_STRING "Avionic Design Plutux"

/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA20_ENABLE_UARTD /* UARTD: debug UART */ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index 5d0c385..5f1bb58 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -113,7 +113,6 @@ #undef CONFIG_SYS_EXT_SERIAL_CLOCK /* external serial clock */ #define CONFIG_SYS_BASE_BAUD 691200 #define CONFIG_BAUDRATE 115200 -#define CONFIG_SERIAL_MULTI

/* The following table includes the supported baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 36f1a57..7e0b302 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -59,7 +59,6 @@ * select serial console configuration */ #define CONFIG_SERIAL2 1 /* use SERIAL2 */ -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_BAUDRATE 115200

/* MMC */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 7727624..5fc6136 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))

/* select serial console configuration */ -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_SERIAL2 1 /* use SERIAL 2 */ #define CONFIG_BAUDRATE 115200

diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 2d6e51d..fb74608 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() -#define CONFIG_SERIAL_MULTI

/* * define CONFIG_SYS_CLK_FREQ to your base crystal clock in Hz diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index afc4a85..b3b3155 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -45,7 +45,6 @@ #define CONFIG_TEGRA20_BOARD_STRING "NVIDIA Seaboard"

/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA20_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE

diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 47369aa..c0f8622 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -68,7 +68,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))

/* select serial console configuration */ -#define CONFIG_SERIAL_MULTI #define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_BAUDRATE 115200 #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 22de344..fb640db 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -64,7 +64,6 @@ * select serial console configuration */ #define CONFIG_SERIAL0 1 /* use SERIAL 0 on SMDKC100 */ -#define CONFIG_SERIAL_MULTI 1

/* PWM */ #define CONFIG_PWM 1 diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 602337f..b796b46 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))

/* select serial console configuration */ -#define CONFIG_SERIAL_MULTI 1 #define CONFIG_SERIAL1 1 /* use SERIAL 1 */ #define CONFIG_BAUDRATE 115200 #define EXYNOS4_DEFAULT_UART_OFFSET 0x010000 diff --git a/include/configs/tec.h b/include/configs/tec.h index 9b3f88d..2c9bbdc 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_BOARD_ODMDATA 0x2b0d8011

/* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA20_ENABLE_UARTD /* UARTD: debug UART */ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE

diff --git a/include/configs/tegra20-common-post.h b/include/configs/tegra20-common-post.h index 42f270f..2093d0a 100644 --- a/include/configs/tegra20-common-post.h +++ b/include/configs/tegra20-common-post.h @@ -154,11 +154,6 @@ #undef CONFIG_OF_CONTROL #endif

-/* remove SERIAL_MULTI */ -#ifdef CONFIG_SERIAL_MULTI -#undef CONFIG_SERIAL_MULTI -#endif - /* remove I2C support */ #ifdef CONFIG_TEGRA_I2C #undef CONFIG_TEGRA_I2C diff --git a/include/configs/trats.h b/include/configs/trats.h index f8da9c0..c195f5d 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -69,7 +69,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))

/* select serial console configuration */ -#define CONFIG_SERIAL_MULTI #define CONFIG_SERIAL2 /* use SERIAL 2 */ #define CONFIG_BAUDRATE 115200

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index b3c5249..0e50316 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -37,7 +37,6 @@ #define CONFIG_TEGRA20_BOARD_STRING "Compulab Trimslice"