diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-23 16:32:48 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-23 16:33:53 +0100 |
commit | 1d8e5bde8f2ce2f4245703fc4baf22a9e80efcd6 (patch) | |
tree | c49375da6277335a831ec34df0be48397199b54b /patches/memtest86+-4.20/0002-Use-serial-port-addresses-provided-by-BIOS.patch | |
parent | f0fd1513969e6cdf28069c522f82f3bdf609fa41 (diff) | |
download | ptxdist-1d8e5bde8f2ce2f4245703fc4baf22a9e80efcd6.tar.gz ptxdist-1d8e5bde8f2ce2f4245703fc4baf22a9e80efcd6.tar.xz |
memtest86+: fix building with gcc-4.6ptxdist-2011.12.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/memtest86+-4.20/0002-Use-serial-port-addresses-provided-by-BIOS.patch')
-rw-r--r-- | patches/memtest86+-4.20/0002-Use-serial-port-addresses-provided-by-BIOS.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/memtest86+-4.20/0002-Use-serial-port-addresses-provided-by-BIOS.patch b/patches/memtest86+-4.20/0002-Use-serial-port-addresses-provided-by-BIOS.patch new file mode 100644 index 000000000..9747df736 --- /dev/null +++ b/patches/memtest86+-4.20/0002-Use-serial-port-addresses-provided-by-BIOS.patch @@ -0,0 +1,33 @@ +From: Alexander Stein <alexander.stein@systec-electronic.com> +Date: Wed, 23 Nov 2011 16:30:13 +0100 +Subject: [PATCH] Use serial port addresses provided by BIOS + +Using this patch memtest86+ uses the serial port addresses provided by BIOS rather hardcoded defaults. + +Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> +--- + lib.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/lib.c b/lib.c +index d107039..91ea950 100644 +--- a/lib.c ++++ b/lib.c +@@ -24,7 +24,7 @@ short serial_cons = SERIAL_CONSOLE_DEFAULT; + #error Bad SERIAL_TTY. Only ttyS0 and ttyS1 are supported. + #endif + short serial_tty = SERIAL_TTY; +-const short serial_base_ports[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8}; ++unsigned short serial_base_ports[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8}; + + #if ((115200%SERIAL_BAUD_RATE) != 0) + #error Bad default baud rate +@@ -1112,6 +1112,8 @@ void serial_console_setup(char *param) + serial_baud_rate = (int) baud_rate; + save_tty: + serial_tty = (short) tty; ++ /* fetch I/O port address from BIOS data area */ ++ serial_base_ports[serial_tty] = ((const unsigned short *) 0x0400)[serial_tty]; + serial_cons = 1; + } + |