pool/memtest86_
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 67066 from Base:System

Browse Source 
Accepted submit request 67066 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/67066
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memtest86+?expand=0&rev=17
This commit is contained in:
Ruediger Oertel 2011-04-21 11:40:04 +00:00 committed by Git OBS Bridge
commit 6b5e90b2d6
5 changed files with 22 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
memtest86+-4.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10cacb8a6228efe094d5e725ff59aa808104fc86eafa02e55c239ca097877bae
size 188040

3
memtest86+-4.20.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48d963fe7d99161c16f9c237a845ea05e4858c34cdc1713a4ea459404249ffa9
size 188711

18
memtest86+.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
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
- 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

8
memtest86+.spec
View File

@ -18,7 +18,7 @@
Name: memtest86+
Version: 4.10
Version: 4.20
Release: 1
#
License: BSD3c(or similar)
@ -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,14 +61,9 @@ Authors:
%prep
%setup
%patch0 -p1
%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

62
serial-enable
View File

@ -1,62 +0,0 @@
---
config.h | 2 +-
init.c | 4 ++++
serial.h | 10 ++++++----
3 files changed, 11 insertions(+), 5 deletions(-)
Index: memtest86+-4.00/config.h
===================================================================
--- memtest86+-4.00.orig/config.h
+++ memtest86+-4.00/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.00/init.c
===================================================================
--- memtest86+-4.00.orig/init.c
+++ memtest86+-4.00/init.c
@@ -42,6 +42,7 @@ static void cpu_type(void);
static void cacheable(void);
static int cpuspeed(void);
int beepmode;
+extern short serial_cons;
static void display_init(void)
{
@@ -78,6 +79,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.00/serial.h
===================================================================
--- memtest86+-4.00.orig/serial.h
+++ memtest86+-4.00/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)