diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 14:30:21 (EDT) |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 14:30:21 (EDT) |
| commit | 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 (patch) | |
| tree | 07202c5fe7d366f50d9d17010f3bbf0a44c08ee8 /getmt86 | |
| parent | 4e8051dfaa0ba5617961481056eb7e79d7b50861 (diff) | |
| parent | 9a321884379a71b5f0986fdfb97a2b6c5bdccd8a (diff) | |
| download | libreboot-r20140903.zip libreboot-r20140903.tar.gz libreboot-r20140903.tar.bz2 | |
Merge libreboot-6b6.r20140903
Conflicts:
buildrom-withgrub
Diffstat (limited to 'getmt86')
| -rwxr-xr-x | getmt86 | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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 ../ |