From 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 03 Sep 2014 14:30:21 -0400
Subject: Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub
---
(limited to 'getmt86')

diff --git a/getmt86 b/getmt86
index 95b5944..43bfc27 100755
--- a/getmt86
+++ b/getmt86
@@ -2,7 +2,7 @@
 
 #  getmt86: Downloads MemTest86+ and patches it
 #
-#	Copyright (C) 2014 Francis Rowe
+#	Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -50,21 +50,21 @@ cd "memtest86+-5.01"
 # Remove the line in the Makefile (comment line 24) that makes memtest86+ connect to an scp server during build
 # Set the following in config.h (to enable use of memtest86+ on serial port):
 
-#	#define SERIAL_CONSOLE_DEFAULT 1
 #	#define SERIAL_TTY 0
 #	#define SERIAL_BAUD_RATE 115200
 
 #	/* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
 #	#define BEEP_MODE 1
 
-# copy the gitdiff into coreboot directory
-cp ../resources/memtest86/patch/diff .
+# place the right config
+rm -rf config.h
+cp ../resources/memtest86/patch/config.h .
 
-# see: libreboot_src/patch.html
-patch -p1 < diff
+# place the right Makefile
+rm -rf Makefile
+cp ../resources/memtest86/patch/Makefile .
 
-# remove the copy (not needed anymore)
-rm -rf diff
+# (diff them with defaults to see what changed)
 
 # we're done
 cd ../
--
cgit v0.9.1