6 files changed, 29 insertions, 154 deletions
diff --git a/resources/memtest86plus/patch/0001-Makefile-remove-scp.patch b/resources/memtest86plus/patch/0001-Makefile-remove-scp.patch
new file mode 100644
index 00000000..f9257b20
--- /dev/null
+++ b/resources/memtest86plus/patch/0001-Makefile-remove-scp.patch
@@ -0,0 +1,11 @@
+--- Makefile	2015-11-18 23:49:40.900093793 +0100
++++ Makefile.new	2015-11-19 00:08:37.392634002 +0100
+@@ -15,3 +15,3 @@
+ CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
+-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
++	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
+ 	
+@@ -23,3 +23,2 @@
+ all: clean memtest.bin memtest 
+-		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
+
diff --git a/resources/memtest86plus/patch/0002-config.h-beep_mode-and-baud_rate.patch b/resources/memtest86plus/patch/0002-config.h-beep_mode-and-baud_rate.patch
new file mode 100644
index 00000000..98df5de7
--- /dev/null
+++ b/resources/memtest86plus/patch/0002-config.h-beep_mode-and-baud_rate.patch
@@ -0,0 +1,12 @@
+--- config.h	2015-11-18 23:49:27.696700200 +0100
++++ config.h.new	2015-11-19 00:08:55.799401157 +0100
+@@ -19,3 +19,3 @@
+ /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
+-#define BEEP_MODE 0
++#define BEEP_MODE 1
+ 
+@@ -37,3 +37,3 @@
+ /* SERIAL_BAUD_RATE - Baud rate for the serial console */
+-#define SERIAL_BAUD_RATE 9600
++#define SERIAL_BAUD_RATE 115200
+ 
diff --git a/resources/memtest86plus/patch/COPYING b/resources/memtest86plus/patch/COPYING
deleted file mode 100644
index b3d325f6..00000000
--- a/resources/memtest86plus/patch/COPYING
+++ /dev/null
@@ -1,6 +0,0 @@
-the "gitdiff" file is a patch for MemTest86+ so check that project's copyright information
-to see what conditions apply.
-
-Look in ../../../docs/RELEASE.html for information about where to get libreboot_src.tar.gz
-or libreboot_meta.tar.gz, both of which contain information about the version of MemTest86+
-used and where it came from.
diff --git a/resources/memtest86plus/patch/Makefile b/resources/memtest86plus/patch/Makefile
deleted file mode 100644
index bc1e6dc1..00000000
--- a/resources/memtest86plus/patch/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# Makefile for MemTest86+
-#
-# Author:		Chris Brady
-# Created:		January 1, 1996
-
-
-#
-# Path for the floppy disk device
-#
-FDISK=/dev/fd0
-
-AS=as -32
-CC=gcc
-
-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
-	
-OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-      config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
-      smp.o vmem.o random.o
-      
-
-all: clean memtest.bin memtest 
-#		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
-
-# Link it statically once so I know I don't have undefined
-# symbols and then link it dynamically so I have full
-# relocation information
-memtest_shared: $(OBJS) memtest_shared.lds Makefile
-	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-	 -o $@ $(OBJS) && \
-	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
-
-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 $@
-
-head.s: head.S config.h defs.h test.h
-	$(CC) -E -traditional $< -o $@
-
-bootsect.s: bootsect.S config.h defs.h
-	$(CC) -E -traditional $< -o $@
-
-setup.s: setup.S config.h defs.h
-	$(CC) -E -traditional $< -o $@
-
-memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
-	$(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
-	memtest_shared.bin -o memtest.bin
-
-reloc.o: reloc.c
-	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-
-test.o: test.c
-	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-
-random.o: random.c
-	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-	
-# rule for build number generation  
-build_number:
-	sh make_buildnum.sh  
-
-clean:
-	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
-		memtest_shared.bin memtest.iso
-
-iso:
-	make all
-	./makeiso.sh
-
-install: all
-	dd <memtest.bin >$(FDISK) bs=8192
-
-install-precomp:
-	dd <precomp.bin >$(FDISK) bs=8192
-	
-dos: all
-	cat mt86+_loader memtest.bin > memtest.exe
diff --git a/resources/memtest86plus/patch/config.h b/resources/memtest86plus/patch/config.h
deleted file mode 100644
index 10ac525a..00000000
--- a/resources/memtest86plus/patch/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * MemTest86+ V5 Specific code (GPL V2.0)
- * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
- * http://www.canardpc.com - http://www.memtest.org
- * ------------------------------------------------
- * config.h - MemTest-86  Version 3.3
- *
- * Compile time configuration options
- *
- * Released under version 2 of the Gnu Public License.
- * By Chris Brady
- */
-
-/* CONSERVATIVE_SMP - If set to 0, SMP will be enabled by default */
-/* Might be enabled in future revision after extensive testing */
-/* In all cases, SMP is disabled by defaut on server platform */
-#define CONSERVATIVE_SMP 1
-
-/* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
-#define BEEP_MODE 1
-
-/* BEEP_END_NO_ERROR - Beep at end of each pass without error. Default off, Change to 1 to enable */
-#define BEEP_END_NO_ERROR 0
-
-/* PARITY_MEM - Enables support for reporting memory parity errors */
-/*	Experimental, normally enabled */
-#define PARITY_MEM
-
-/* 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
-
-/* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ 
-#define SERIAL_TTY 0
-
-/* SERIAL_BAUD_RATE - Baud rate for the serial console */
-#define SERIAL_BAUD_RATE 115200
-
-/* SCRN_DEBUG - extra check for SCREEN_BUFFER
- */ 
-/* #define SCRN_DEBUG */
-
-/* APM - Turns off APM at boot time to avoid blanking the screen */
-/*	Normally enabled */
-#define APM_OFF
-
-/* USB_WAR - Enables a workaround for errors caused by BIOS USB keyboard */
-/*	and mouse support*/
-/*	Normally enabled */
-#define USB_WAR
-
diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus
index 88ba8558..d7da36c4 100755
--- a/resources/scripts/helpers/download/memtest86plus
+++ b/resources/scripts/helpers/download/memtest86plus
@@ -58,23 +58,14 @@ rm -f "memtest86+-5.01.tar.gz"
 # make direcotory name consistent
 mv "memtest86+-5.01/" "memtest86plus/"
 
-# there are modifications required
-cd "memtest86plus/"
-
 # Apply necessary patches
 # ------------------------------------------------------------------------------
 
-# place the right config
-rm -f "config.h"
-cp "../resources/memtest86plus/patch/config.h" .
-
-# place the right Makefile
-rm -f "Makefile"
-cp "../resources/memtest86plus/patch/Makefile" .
-
-# (diff them with defaults to see what changed)
-
-# we're done
-cd "../"
+(
+cd "memtest86plus/"
+for patch in ../resources/memtest86plus/patch/*; do
+	patch < "${patch}"
+done
+)
 
 printf "\n\n"