Update memtest86+ to 5.01.

upstream changes:

Enhancements in v5.01:
    New Features
	Added support for up to 2 TB of RAM on X64 CPUs
	Added experimental SMT support up to 32 cores (Press F2 to enable at startup)
	Added complete detection for memory controllers
	Added Motherboard Manufacturer & Model reporting
	Added CPU temperature reporting
	Added enhanced Fail Safe Mode (Press F1 at startup)
	Added support for Intel "Sandy Bridge-E" CPUs
	Added support for Intel "Ivy Bridge" CPUs
	Added preliminary support for Intel "Haswell" CPUs (Core 4th Gen)
	Added preliminary support for Intel "Haswell-ULT" CPUs
	Added support for AMD "Kabini" (K16) CPUs
	Added support for AMD "Bulldozer" CPUs
	Added support for AMD "Trinity" CPUs
	Added support for AMD E-/C-/G-/Z- "Bobcat" CPUs
	Added support for Intel Atom "Pineview" CPUs
	Added support for Intel Atom "Cedar Trail" CPUs
	Added SPD detection on most AMD Chipsets
    Bug Fixes
	Enforced Coreboot support
	Optimized run time for faster memory error detection
	Rewriten lots of memory timings detection cod
	Corrected bugs, bugs and more bugs (some could remain)

7 files changed, 122 insertions, 92 deletions

diff --git a/sysutils/memtestplus/patches/patch-aa b/sysutils/memtestplus/patches/patch-aa
index 84059e3ebf1..bae46682513 100644
--- a/sysutils/memtestplus/patches/patch-aa
+++ b/sysutils/memtestplus/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
+$NetBSD: patch-aa,v 1.5 2013/12/08 00:35:28 jakllsch Exp $
 
---- Makefile.orig	2009-09-22 00:35:46.000000000 +0000
+--- Makefile.orig	2013-08-10 02:01:58.000000000 +0000
 +++ Makefile
-@@ -6,7 +6,7 @@
+@@ -7,7 +7,7 @@
  #
  # Path for the floppy disk device
  #
@@ -11,11 +11,27 @@ $NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
  
  AS=as -32
  CC=gcc
-@@ -61,7 +61,6 @@ asm:
- iso:
- 	make all
- 	./makeiso.sh
--	rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin
+@@ -20,8 +20,7 @@ OBJS= head.o reloc.o main.o test.o init.
+       smp.o vmem.o random.o
+       
  
- install: all
- 	dd <memtest.bin >$(FDISK) bs=8192
+-all: clean memtest.bin memtest 
+-		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
++all: memtest.bin memtest 
+ 
+ # Link it statically once so I know I don't have undefined
+ # symbols and then link it dynamically so I have full
+@@ -34,8 +33,11 @@ memtest_shared: $(OBJS) memtest_shared.l
+ memtest_shared.bin: memtest_shared
+ 	objcopy -O binary $< memtest_shared.bin
+ 
+-memtest: memtest_shared.bin memtest.lds
+-	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
++nbstart.s: nbstart.S config.h defs.h
++	$(CC) -E -traditional $< -o $@
++
++memtest: memtest_shared.bin memtest.lds nbstart.o
++	$(LD) -T memtest.lds -z max-page-size=0x1000 nbstart.o -b binary memtest_shared.bin -o $@
+ 
+ head.s: head.S config.h defs.h test.h
+ 	$(CC) -E -traditional $< -o $@
diff --git a/sysutils/memtestplus/patches/patch-ab b/sysutils/memtestplus/patches/patch-ab
index 07192eb3a92..6c1a0eed809 100644
--- a/sysutils/memtestplus/patches/patch-ab
+++ b/sysutils/memtestplus/patches/patch-ab
@@ -1,62 +1,49 @@
-$NetBSD: patch-ab,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
+$NetBSD: patch-ab,v 1.5 2013/12/08 00:35:28 jakllsch Exp $
 
---- test.c.orig	2009-09-22 00:35:46.000000000 +0000
+--- test.c.orig	2013-08-10 02:29:44.000000000 +0000
 +++ test.c
-@@ -11,10 +11,32 @@
- 
- #include "test.h"
- #include "config.h"
+@@ -14,7 +14,6 @@
+ #include "stdint.h"
+ #include "cpuid.h"
+ #include "smp.h"
 -#include <sys/io.h>
- #include "dmi.h"
- #include <inttypes.h>
  
-+static __inline void
-+pkg_outb (unsigned char value, unsigned short int port)
+ extern struct cpu_ident cpu_id;
+ extern volatile int    mstr_cpu;
+@@ -29,6 +28,36 @@ void rand_seed( unsigned int seed1, unsi
+ ulong rand(int me);
+ void poll_errors();
+ 
++static inline void outb(unsigned char value, unsigned short int port)
 +{
-+  __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
++	asm __volatile__ (
++		"outb %b0,%w1\n\t"
++		: :"a" (value), "Nd" (port)
++	);
 +}
 +
-+static __inline void
-+pkg_outb_p (unsigned char value, unsigned short int port)
++static __inline void outb_p(unsigned char value, unsigned short int port)
 +{
-+  __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value),
-+                        "Nd" (port));
++	asm __volatile__ (
++		"outb %b0,%w1\n\t"
++		"outb %%al,$0x80\n\t"
++		: : "a" (value), "Nd" (port)
++	);
 +}
 +
-+static __inline unsigned char
-+pkg_inb_p (unsigned short int port)
++static __inline unsigned char inb_p(unsigned short int port)
 +{
-+  unsigned char _v;
++	unsigned char v;
 +
-+  __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
-+  return _v;
++  	asm __volatile__ (
++		"inb %w1,%0\n\t"
++		"outb %%al,$0x80\n\t"
++		: "=a" (v)
++		: "Nd" (port)
++	);
++	return v;
 +}
 +
-+
- extern int segs, bail;
- extern volatile ulong *p;
- extern ulong p1, p2;
-@@ -1414,18 +1436,18 @@ void beep(unsigned int frequency)
- 	unsigned int count = 1193180 / frequency;
- 
- 	// Switch on the speaker
--	outb_p(inb_p(0x61)|3, 0x61);
-+	pkg_outb_p(pkg_inb_p(0x61)|3, 0x61);
- 
- 	// Set command for counter 2, 2 byte write
--	outb_p(0xB6, 0x43);
-+	pkg_outb_p(0xB6, 0x43);
- 
- 	// Select desired Hz
--	outb_p(count & 0xff, 0x42);
--	outb((count >> 8) & 0xff, 0x42);
-+	pkg_outb_p(count & 0xff, 0x42);
-+	pkg_outb((count >> 8) & 0xff, 0x42);
- 
- 	// Block for 100 microseconds
- 	sleep(100, 1);
- 
- 	// Switch off the speaker
--	outb(inb_p(0x61)&0xFC, 0x61);
-+	pkg_outb(pkg_inb_p(0x61)&0xFC, 0x61);
- }
+ static inline ulong roundup(ulong value, ulong mask)
+ {
+ 	return (value + mask) & ~mask;
diff --git a/sysutils/memtestplus/patches/patch-ac b/sysutils/memtestplus/patches/patch-ac
index 2d078aeee92..9fc534c8f10 100644
--- a/sysutils/memtestplus/patches/patch-ac
+++ b/sysutils/memtestplus/patches/patch-ac
@@ -1,13 +1,16 @@
-$NetBSD: patch-ac,v 1.5 2010/07/08 18:54:22 jakllsch Exp $
+$NetBSD: patch-ac,v 1.6 2013/12/08 00:35:28 jakllsch Exp $
 
---- memtest.lds.orig	2010-04-28 12:11:15.000000000 +0000
+--- memtest.lds.orig	2013-08-10 02:01:58.000000000 +0000
 +++ memtest.lds
-@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);

- 

- ENTRY(_start); 

- SECTIONS {

--	. = 0x5000;

-+	. = 0x100000;

- 	_start = . ;

- 	.data : {

- 		*(.data)

+@@ -3,9 +3,7 @@ OUTPUT_ARCH(i386);
+ 
+ ENTRY(_start); 
+ SECTIONS {
+-	. = 0x10000;
+-	_start = . ;
+-	.data : {
+-		*(.data)
++	.text 0x100000 : {
++		*(.*)
+ 	}
+ }
diff --git a/sysutils/memtestplus/patches/patch-ad b/sysutils/memtestplus/patches/patch-ad
index ff9a136f3fc..2c189351873 100644
--- a/sysutils/memtestplus/patches/patch-ad
+++ b/sysutils/memtestplus/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2009/11/24 17:20:40 jakllsch Exp $
+$NetBSD: patch-ad,v 1.3 2013/12/08 00:35:28 jakllsch Exp $
 
---- README.orig	2009-09-22 00:35:46.000000000 +0000
+--- README.orig	2013-12-08 00:26:53.000000000 +0000
 +++ README
-@@ -174,7 +174,7 @@ individual errors.  In BadRAM Patterns m
- use with the Linux BadRAM feature.  This slick feature allows Linux to

- avoid bad memory pages.  Details about the BadRAM feature can be found at:

- 

--	http://home.zonnet.nl/vanrein/badram

-+	http://rick.vanrein.org/linux/badram/

- 

- For individual errors the following information is displayed when a memory

- error is detected.  An error message is only displayed for errors with a

+@@ -241,7 +241,7 @@ work-around makes it possible for Linux 
+ RAM.  For more information on BadRAM suppor
+ for Linux, sail t
+ 
+-       http://home.zonnet.nl/vanrein/badra
++       http://rick.vanrein.org/linux/badram/
+ 
+ Sometimes memory errors show up due to component incompatibility.  A memor
+ module may work fine in one system and not in another.  This is no
diff --git a/sysutils/memtestplus/patches/patch-ae b/sysutils/memtestplus/patches/patch-ae
deleted file mode 100644
index fd6afc844a1..00000000000
--- a/sysutils/memtestplus/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2009/11/24 17:20:40 jakllsch Exp $
-
---- error.c.orig	2009-09-22 00:35:46.000000000 +0000
-+++ error.c
-@@ -11,7 +11,6 @@
-  
- #include "test.h"
- #include "config.h"
--#include <sys/io.h>
- #include "dmi.h"
- #define NULL 0
- 
diff --git a/sysutils/memtestplus/patches/patch-makeiso.sh b/sysutils/memtestplus/patches/patch-makeiso.sh
new file mode 100644
index 00000000000..be2a683813b
--- /dev/null
+++ b/sysutils/memtestplus/patches/patch-makeiso.sh
@@ -0,0 +1,22 @@
+$NetBSD: patch-makeiso.sh,v 1.1 2013/12/08 00:35:28 jakllsch Exp $
+
+--- makeiso.sh.orig	2013-08-10 02:03:33.000000000 +0000
++++ makeiso.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # check to see if the correct tools are installed
+-for X in wc genisoimage
++for X in wc mkisofs
+ do
+ 	if [ "$(which $X)" = "" ]; then
+ 		echo "makeiso.sh error: $X is not in your path." >&2
+@@ -37,7 +37,7 @@ cd cd
+ echo -e "There is nothing to do here\r\r\nMemtest86+ is located on the bootsector of this CD\r\r\n" > README.TXT
+ echo -e "Just boot from this CD and Memtest86+ will launch" >> README.TXT
+ 
+-genisoimage -A "MKISOFS 1.1.2" -p "Memtest86+ 5.01" -publisher "Samuel D. <sdemeule@memtest.org>" -b boot/memtest.img -c boot/boot.catalog -V "MT501" -o memtest.iso .
++mkisofs -A "MKISOFS 1.1.2" -p "Memtest86+ 5.01" -publisher "Samuel D. <sdemeule@memtest.org>" -b boot/memtest.img -c boot/boot.catalog -V "MT501" -o memtest.iso .
+ mv memtest.iso ../mt501.iso
+ cd ..
+ rm -rf cd
diff --git a/sysutils/memtestplus/patches/patch-nbstart.S b/sysutils/memtestplus/patches/patch-nbstart.S
new file mode 100644
index 00000000000..6a82c91ff18
--- /dev/null
+++ b/sysutils/memtestplus/patches/patch-nbstart.S
@@ -0,0 +1,14 @@
+$NetBSD: patch-nbstart.S,v 1.1 2013/12/08 00:35:28 jakllsch Exp $
+
+--- nbstart.S.orig	2013-12-08 00:26:53.000000000 +0000
++++ nbstart.S
+@@ -0,0 +1,9 @@
++#include "defs.h"
++	.globl _start
++_start:
++	movl	$LOW_TEST_ADR, %edi
++	movl	$_binary_memtest_shared_bin_start, %esi
++	movl	$_binary_memtest_shared_bin_size, %ecx
++	movl	%edi, %eax
++	rep movsb %ds:(%esi),%es:(%edi)
++	jmp	*%eax