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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memtest86+?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-01-25 16:27:40 +00:00 committed by Git OBS Bridge
parent 3377c88819
commit 945c9705da
10 changed files with 133 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fix-destdir Normal file
View File

@ -0,0 +1,24 @@
diff -ur memtest86+-1.70.orig/Makefile memtest86+-1.70/Makefile
--- memtest86+-1.70.orig/Makefile 2006-12-27 02:34:57.000000000 +0100
+++ memtest86+-1.70/Makefile 2007-01-25 16:34:01.000000000 +0100
@@ -7,6 +7,7 @@
# Path for the floppy disk device
#
FDISK=/dev/fd0
+TARGETDIR=/boot
CC=gcc
#
@@ -116,7 +117,10 @@
wormkill:
rm -f *~
-install: all
+install:
+ install -o root -g root memtest.bin $(DESTDIR)$(TARGETDIR)/
+
+install-floppy: all
dd <memtest.bin >$(FDISK) bs=8192
install-bin:
Only in memtest86+-1.70: Makefile.orig

11
include-linkonce Normal file
View File

@ -0,0 +1,11 @@
diff -ur memtest86+-1.70.orig/memtest_shared.lds memtest86+-1.70/memtest_shared.lds
--- memtest86+-1.70.orig/memtest_shared.lds 2006-12-27 02:33:06.000000000 +0100
+++ memtest86+-1.70/memtest_shared.lds 2007-01-25 16:34:19.000000000 +0100
@@ -8,6 +8,7 @@
_start = .;
*(.text)
*(.text.*)
+ *(.gnu.linkonce.t.*)
*(.plt)
_etext = . ;
} = 0x9090

37
memtest86+-1.65.diff
View File

@ -1,37 +0,0 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -7,6 +7,7 @@
# Path for the floppy disk device
#
FDISK=/dev/fd0
+TARGETDIR=/boot
CC=gcc
#
@@ -114,7 +115,10 @@ clean:
wormkill:
rm -f *~
-install: all
+install:
+ install -o root -g root memtest.bin $(DESTDIR)$(TARGETDIR)/
+
+install-floppy: all
dd <memtest.bin >$(FDISK) bs=8192
install-bin:
Index: config.h
===================================================================
--- config.h.orig
+++ 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_BAUD_RATE - Baud rate for the serial console */
#define SERIAL_BAUD_RATE 9600

3
memtest86+-1.65.tar.gz
View File

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

12
memtest86+-1.65_include-linkonce.patch
View File

@ -1,12 +0,0 @@
Index: memtest_shared.lds
===================================================================
--- memtest_shared.lds.orig
+++ memtest_shared.lds
@@ -8,6 +8,7 @@ SECTIONS {
_start = .;
*(.text)
*(.text.*)
+ *(.gnu.linkonce.t.*)
*(.plt)
_etext = . ;
} = 0x9090

43
memtest86+-1.65_timeout-serialconsole.diff
View File

@ -1,43 +0,0 @@
Index: init.c
===================================================================
--- init.c.orig
+++ init.c
@@ -29,6 +29,7 @@ static ulong memspeed(ulong src, ulong l
static void cpu_type(void);
static void cacheable(void);
static int cpuspeed(void);
+extern short serial_cons;
static void display_init(void)
{
@@ -65,6 +66,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: serial.h
===================================================================
--- serial.h.orig
+++ serial.h
@@ -140,10 +140,12 @@
#define serial_echo_inb(a) inb((a)+0x3f8)
#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)

3
memtest86+-1.70.tar.gz Normal file
View File

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

17
memtest86+.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Jan 25 16:57:23 CET 2007 - duwe@suse.de
+ update to 1.70:
- Added new DMI polling feature (Thanks to Joachim D.)
- Added Support for Core/Core2 Solo/Duo/Quad CPU
- Added Support for AMD K8 with DDR2 Memory
- Added Support for Intel CPU with 192/384 KB L2 Cache
- Added Support for FB-DIMM based memory (DMI)
- Added Detection for ALI CyberAladdin-T (M1644)
- Added Detection for Turion 64 X2
- Added Detection for AMD K8 with unknown chipsets
- Added Support for ATi Radeon xPress 3200
- Added Support for Intel i975X
- Added Support for Intel Q965/P965
- Added Support for Intel Q963/Q965
-------------------------------------------------------------------
Thu Nov 16 19:35:12 CET 2006 - mrueckert@suse.de

37
memtest86+.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package memtest86+ (Version 1.65)
# spec file for package memtest86+ (Version 1.70)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -10,14 +10,13 @@
Name: memtest86+
Version: 1.65
Version: 1.70
Release: 1
#
License: BSD License and BSD-like, Other License(s), see package
License: BSD License and BSD-like
Group: System/Boot
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bin86 nasm
%ifarch x86_64
BuildRequires: glibc-devel-32bit
%endif
@ -27,10 +26,10 @@ Obsoletes: memtest86 <= 3.2
Provides: memtest86 > 3.2
#
URL: http://www.memtest.org
Source: http://www.memtest.org/download/1.65/memtest86+-%{version}.tar.gz
Patch0: memtest86+-1.65.diff
Patch1: memtest86+-1.65_timeout-serialconsole.diff
Patch2: memtest86+-1.65_include-linkonce.patch
Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
Patch0: fix-destdir
Patch1: include-linkonce
Patch2: serial-enable
#
Summary: Memory Testing Image for x86 Architecture
@ -55,9 +54,9 @@ Authors:
%prep
%setup
%patch0
%patch1
%patch2
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%ifarch x86_64
@ -75,6 +74,20 @@ install -D -m 0644 memtest.bin $RPM_BUILD_ROOT/boot/memtest.bin
%doc README* changelog FAQ
%changelog -n memtest86+
* Thu Jan 25 2007 - duwe@suse.de
+ update to 1.70:
- Added new DMI polling feature (Thanks to Joachim D.)
- Added Support for Core/Core2 Solo/Duo/Quad CPU
- Added Support for AMD K8 with DDR2 Memory
- Added Support for Intel CPU with 192/384 KB L2 Cache
- Added Support for FB-DIMM based memory (DMI)
- Added Detection for ALI CyberAladdin-T (M1644)
- Added Detection for Turion 64 X2
- Added Detection for AMD K8 with unknown chipsets
- Added Support for ATi Radeon xPress 3200
- Added Support for Intel i975X
- Added Support for Intel Q965/P965
- Added Support for Intel Q963/Q965
* Thu Nov 16 2006 - mrueckert@suse.de
- switch to memtest86+ (http://www.memtest.org)
Compared to memtest86 3.2 it supports more hardware. and has

53
serial-enable Normal file
View File

@ -0,0 +1,53 @@
diff -ur memtest86+-1.70.orig/config.h memtest86+-1.70/config.h
--- memtest86+-1.70.orig/config.h 2006-12-27 02:33:06.000000000 +0100
+++ memtest86+-1.70/config.h 2007-01-25 16:34:01.000000000 +0100
@@ -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_BAUD_RATE - Baud rate for the serial console */
#define SERIAL_BAUD_RATE 9600
diff -ur memtest86+-1.70.orig/init.c memtest86+-1.70/init.c
--- memtest86+-1.70.orig/init.c 2007-01-04 08:19:43.000000000 +0100
+++ memtest86+-1.70/init.c 2007-01-25 16:34:31.000000000 +0100
@@ -29,6 +29,7 @@
static void cpu_type(void);
static void cacheable(void);
static int cpuspeed(void);
+extern short serial_cons;
static void display_init(void)
{
@@ -65,6 +66,9 @@
}
serial_echo_print("\x1B[0m");
+
+ if (!serial_cons && SERIAL_CONSOLE_DEFAULT)
+ cprint (23, 0, "Timout on serial console: disabled");
}
/*
diff -ur memtest86+-1.70.orig/serial.h memtest86+-1.70/serial.h
--- memtest86+-1.70.orig/serial.h 2006-12-27 02:33:06.000000000 +0100
+++ memtest86+-1.70/serial.h 2007-01-25 16:34:31.000000000 +0100
@@ -140,10 +140,12 @@
#define serial_echo_inb(a) inb((a)+0x3f8)
#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)