From dd1540efb76d3048e961a9485e97554acc9e33ef Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Mon, 1 Oct 2007 07:46:55 +1000 Subject: [PATCH] --- yaml --- r: 67461 b: refs/heads/master c: bedfc8a040378cb51f46155c980d295c2c397203 h: refs/heads/master i: 67459: 270cfdefe1060337b3c8459e91c622e46acdefaf v: v3 --- [refs] | 2 +- trunk/arch/ppc/boot/simple/misc-embedded.c | 4 +++- trunk/arch/ppc/boot/simple/uartlite_tty.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e1f460537263..80f19ee17bea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 267b49a96e30f129600bdb4f3fa6d80d6dd42523 +refs/heads/master: bedfc8a040378cb51f46155c980d295c2c397203 diff --git a/trunk/arch/ppc/boot/simple/misc-embedded.c b/trunk/arch/ppc/boot/simple/misc-embedded.c index 8a08ad397ed5..d5a00eb0e4eb 100644 --- a/trunk/arch/ppc/boot/simple/misc-embedded.c +++ b/trunk/arch/ppc/boot/simple/misc-embedded.c @@ -89,7 +89,9 @@ load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *b * initialize the serial console port. */ embed_config(&bp); -#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) +#if defined(CONFIG_SERIAL_CPM_CONSOLE) || \ + defined(CONFIG_SERIAL_8250_CONSOLE) || \ + defined(CONFIG_SERIAL_UARTLITE_CONSOLE) com_port = serial_init(0, bp); #endif diff --git a/trunk/arch/ppc/boot/simple/uartlite_tty.c b/trunk/arch/ppc/boot/simple/uartlite_tty.c index 0eae1eab38d4..ca1743e3e912 100644 --- a/trunk/arch/ppc/boot/simple/uartlite_tty.c +++ b/trunk/arch/ppc/boot/simple/uartlite_tty.c @@ -16,6 +16,14 @@ #define UARTLITE_BASEADDR ((void*)(XPAR_UARTLITE_0_BASEADDR)) +unsigned long +serial_init(int chan, void *ignored) +{ + /* Clear the RX FIFO */ + out_be32(UARTLITE_BASEADDR + 0x0C, 0x2); + return 0; +} + void serial_putc(unsigned long com_port, unsigned char c) {