From 64a3710deaf5eb85b16a51e66d38f33aa23f76cd110808be1d8aec5bb03906f2 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 29 Mar 2011 13:26:16 +0000 Subject: [PATCH 1/2] - Update to version 4.20: - Added failsafe mode (F1 at startup) - Added support for Intel "Sandy Bridge" CPU - Added support for AMD "fusion" CPU - Added Coreboot "table forward" support - Corrected some memory brand not detected - Various bug fixes - Remove %ifarch x86_64 check in .spec file. The internal Makefile already adds -m32 and -as32 itself. OBS-URL: https://build.opensuse.org/package/show/Base:System/memtest86+?expand=0&rev=9 --- memtest86+-4.10.tar.bz2 | 3 --- memtest86+-4.20.tar.bz2 | 3 +++ memtest86+.changes | 13 +++++++++++++ memtest86+.spec | 12 ++++-------- serial-enable | 26 +++++++++++++------------- 5 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 memtest86+-4.10.tar.bz2 create mode 100644 memtest86+-4.20.tar.bz2 diff --git a/memtest86+-4.10.tar.bz2 b/memtest86+-4.10.tar.bz2 deleted file mode 100644 index 0735b9f..0000000 --- a/memtest86+-4.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10cacb8a6228efe094d5e725ff59aa808104fc86eafa02e55c239ca097877bae -size 188040 diff --git a/memtest86+-4.20.tar.bz2 b/memtest86+-4.20.tar.bz2 new file mode 100644 index 0000000..eb916b6 --- /dev/null +++ b/memtest86+-4.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48d963fe7d99161c16f9c237a845ea05e4858c34cdc1713a4ea459404249ffa9 +size 188711 diff --git a/memtest86+.changes b/memtest86+.changes index 4019fd2..6a7abb5 100644 --- a/memtest86+.changes +++ b/memtest86+.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Mar 29 15:23:33 CEST 2011 - trenn@suse.de + +- Update to version 4.20: + - Added failsafe mode (F1 at startup) + - Added support for Intel "Sandy Bridge" CPU + - Added support for AMD "fusion" CPU + - Added Coreboot "table forward" support + - Corrected some memory brand not detected + - Various bug fixes +- Remove %ifarch x86_64 check in .spec file. The internal Makefile + already adds -m32 and -as32 itself. + ------------------------------------------------------------------- Mon Aug 30 09:59:35 UTC 2010 - trenn@novell.com diff --git a/memtest86+.spec b/memtest86+.spec index f713aa8..f71645d 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -1,7 +1,7 @@ # -# spec file for package memtest86+ (Version 4.00) +# spec file for package memtest86+ (Version 4.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ Name: memtest86+ -Version: 4.10 +Version: 4.20 Release: 1 # -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: System/Boot # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,11 +65,7 @@ Authors: %patch1 -p1 %build -%ifarch x86_64 - make CC="gcc -m32" AS="as --32" -%else make -%endif %install install -D -m 0644 memtest.bin $RPM_BUILD_ROOT/boot/memtest.bin diff --git a/serial-enable b/serial-enable index d2a0360..2155ada 100644 --- a/serial-enable +++ b/serial-enable @@ -4,10 +4,10 @@ serial.h | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) -Index: memtest86+-4.00/config.h +Index: memtest86+-4.20/config.h =================================================================== ---- memtest86+-4.00.orig/config.h -+++ memtest86+-4.00/config.h +--- memtest86+-4.20.orig/config.h ++++ memtest86+-4.20/config.h @@ -13,7 +13,7 @@ /* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */ /* This is normally off since it slows down testing. Change to a 1 */ @@ -17,19 +17,19 @@ Index: memtest86+-4.00/config.h /* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ #define SERIAL_TTY 0 -Index: memtest86+-4.00/init.c +Index: memtest86+-4.20/init.c =================================================================== ---- memtest86+-4.00.orig/init.c -+++ memtest86+-4.00/init.c +--- memtest86+-4.20.orig/init.c ++++ memtest86+-4.20/init.c @@ -42,6 +42,7 @@ static void cpu_type(void); static void cacheable(void); static int cpuspeed(void); - int beepmode; + int beepmode, fail_safe; +extern short serial_cons; - static void display_init(void) - { -@@ -78,6 +79,9 @@ static void display_init(void) + /* Failsafe function */ + /* msec: number of ms to wait - scs: scancode expected to stop */ +@@ -125,6 +126,9 @@ static void display_init(void) } serial_echo_print("\x1B[0m"); @@ -39,10 +39,10 @@ Index: memtest86+-4.00/init.c } /* -Index: memtest86+-4.00/serial.h +Index: memtest86+-4.20/serial.h =================================================================== ---- memtest86+-4.00.orig/serial.h -+++ memtest86+-4.00/serial.h +--- memtest86+-4.20.orig/serial.h ++++ memtest86+-4.20/serial.h @@ -140,10 +140,12 @@ #define serial_echo_inb(a) inb((a)+serial_base_ports[serial_tty]) #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) From 3977e8e216d9f6f578bf045ed9d3d8562079bb66866c26ca4617914b2e7daf92 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Wed, 30 Mar 2011 11:45:23 +0000 Subject: [PATCH 2/2] - Do not enable serial by default, console=ttySx,... still works OBS-URL: https://build.opensuse.org/package/show/Base:System/memtest86+?expand=0&rev=10 --- memtest86+.changes | 5 ++++ memtest86+.spec | 2 -- serial-enable | 62 ---------------------------------------------- 3 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 serial-enable diff --git a/memtest86+.changes b/memtest86+.changes index 6a7abb5..9fdd03b 100644 --- a/memtest86+.changes +++ b/memtest86+.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 30 11:47:34 UTC 2011 - trenn@suse.de + +- Do not enable serial by default, console=ttySx,... still works + ------------------------------------------------------------------- Tue Mar 29 15:23:33 CEST 2011 - trenn@suse.de diff --git a/memtest86+.spec b/memtest86+.spec index f71645d..5dad1ed 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -37,7 +37,6 @@ Provides: memtest86 > 3.2 Url: http://www.memtest.org Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2 Patch0: fix-destdir -Patch1: serial-enable Summary: Memory Testing Image for x86 Architecture %description @@ -62,7 +61,6 @@ Authors: %prep %setup %patch0 -p1 -%patch1 -p1 %build make diff --git a/serial-enable b/serial-enable deleted file mode 100644 index 2155ada..0000000 --- a/serial-enable +++ /dev/null @@ -1,62 +0,0 @@ ---- - config.h | 2 +- - init.c | 4 ++++ - serial.h | 10 ++++++---- - 3 files changed, 11 insertions(+), 5 deletions(-) - -Index: memtest86+-4.20/config.h -=================================================================== ---- memtest86+-4.20.orig/config.h -+++ memtest86+-4.20/config.h -@@ -13,7 +13,7 @@ - /* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */ - /* This is normally off since it slows down testing. Change to a 1 */ - /* to enable. */ --#define SERIAL_CONSOLE_DEFAULT 0 -+#define SERIAL_CONSOLE_DEFAULT 1 - - /* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ - #define SERIAL_TTY 0 -Index: memtest86+-4.20/init.c -=================================================================== ---- memtest86+-4.20.orig/init.c -+++ memtest86+-4.20/init.c -@@ -42,6 +42,7 @@ static void cpu_type(void); - static void cacheable(void); - static int cpuspeed(void); - int beepmode, fail_safe; -+extern short serial_cons; - - /* Failsafe function */ - /* msec: number of ms to wait - scs: scancode expected to stop */ -@@ -125,6 +126,9 @@ static void display_init(void) - } - - serial_echo_print("\x1B[0m"); -+ -+ if (!serial_cons && SERIAL_CONSOLE_DEFAULT) -+ cprint (23, 0, "Timout on serial console: disabled"); - } - - /* -Index: memtest86+-4.20/serial.h -=================================================================== ---- memtest86+-4.20.orig/serial.h -+++ memtest86+-4.20/serial.h -@@ -140,10 +140,12 @@ - #define serial_echo_inb(a) inb((a)+serial_base_ports[serial_tty]) - #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) - /* Wait for transmitter & holding register to empty */ --#define WAIT_FOR_XMITR \ -- do { \ -- lsr = serial_echo_inb(UART_LSR); \ -- } while ((lsr & BOTH_EMPTY) != BOTH_EMPTY) -+#define WAIT_FOR_XMITR \ -+ int _i = 1<<15; \ -+ do { \ -+ lsr = serial_echo_inb(UART_LSR); \ -+ } while ((lsr & BOTH_EMPTY) != BOTH_EMPTY && --_i); \ -+ if (!_i) serial_cons = 0 - - #if 0 - static inline void serial_echo(int ch)