Mercurial > hg > aboriginal
changeset 1654:d847359146c4
QEMU 2.0 no longer needs the sh4 patch to avoid touching certain registers.
author | Rob Landley <rob@landley.net> |
---|---|
date | Tue, 13 May 2014 05:03:52 -0500 |
parents | e29e0ca60d74 |
children | e74afb9aac72 |
files | sources/patches/linux-fixsh4-2.patch |
diffstat | 1 files changed, 0 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/patches/linux-fixsh4-2.patch Sun May 11 22:58:42 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -This is "the wrong fix". The correct fix is to qemu (take out the "#ifdef 0" -around the 0x18 case in hw/sh_serial.c line 250 or so, or just don't -abort() on unknown register reads), and I pinged the qemu -mailing list about that, but this works with existing qemu releases. - -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 1564186..e22eaf0 100644 ---- a/drivers/tty/serial/sh-sci.c -+++ b/drivers/tty/serial/sh-sci.c -@@ -1803,6 +1803,8 @@ static void sci_reset(struct uart_port *port) - struct plat_sci_reg *reg; - unsigned int status; - -+return; -+ - do { - status = serial_port_in(port, SCxSR); - } while (!(status & SCxSR_TEND(port))); -@@ -1868,9 +1870,9 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, - - sci_init_pins(port, termios->c_cflag); - -- reg = sci_getreg(port, SCFCR); -+ reg = sci_getreg(port, 0x30); - if (reg->size) { -- unsigned short ctrl = serial_port_in(port, SCFCR); -+ unsigned short ctrl = 0; //serial_port_in(port, SCFCR); - - if (s->cfg->capabilities & SCIx_HAVE_RTSCTS) { - if (termios->c_cflag & CRTSCTS)