Merge libreboot-6b6.r20140903

Conflicts:
	buildrom-withgrub

3 files changed, 133 insertions, 40 deletions

diff --git a/resources/memtest86/patch/Makefile b/resources/memtest86/patch/Makefile
new file mode 100644
index 0000000..1a187b6
--- /dev/null
+++ b/resources/memtest86/patch/Makefile
@@ -0,0 +1,81 @@
+# 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 
+	
+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/memtest86/patch/config.h b/resources/memtest86/patch/config.h
new file mode 100644
index 0000000..10ac525
--- /dev/null
+++ b/resources/memtest86/patch/config.h
@@ -0,0 +1,52 @@
+/*
+ * 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/memtest86/patch/diff b/resources/memtest86/patch/diff
deleted file mode 100644
index 0abd8d0..0000000
--- a/resources/memtest86/patch/diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -rupN memtest86+-5.01_/config.h memtest86+-5.01/config.h
---- memtest86+-5.01_/config.h	2014-06-25 22:57:47.893476783 +0100
-+++ memtest86+-5.01/config.h	2014-06-25 22:59:01.269840630 +0100
-@@ -17,7 +17,7 @@
- #define CONSERVATIVE_SMP 1
- 
- /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
--#define BEEP_MODE 0
-+#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
-@@ -29,13 +29,13 @@
- /* 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
- 
- /* SERIAL_BAUD_RATE - Baud rate for the serial console */
--#define SERIAL_BAUD_RATE 9600
-+#define SERIAL_BAUD_RATE 115200
- 
- /* SCRN_DEBUG - extra check for SCREEN_BUFFER
-  */ 
-diff -rupN memtest86+-5.01_/Makefile memtest86+-5.01/Makefile
---- memtest86+-5.01_/Makefile	2014-06-25 22:57:47.893476783 +0100
-+++ memtest86+-5.01/Makefile	2014-06-25 22:59:19.237929751 +0100
-@@ -21,7 +21,7 @@ OBJS= head.o reloc.o main.o test.o init.
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
-+#		 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