summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2022-02-08 07:39:54 +0000
committerLeah Rowe <leah@libreboot.org>2022-02-08 07:45:41 +0000
commit37b450051362b4c54a8e05807f173b04649ce501 (patch)
tree4b1e4ad075ddee43a744b285e6500e5cdf57782a /resources
parent937590d2b16815f6c2d3387519a142b2227bff40 (diff)
memtest86+: fix build error (patch from FĂ©licien Pillot)
Diffstat (limited to 'resources')
-rw-r--r--resources/memtest86plus/patch/0001-config.h-beep_mode-and-baud_rate.patch20
-rw-r--r--resources/memtest86plus/patch/0001-fix-memtest86-linker-error-during-build.patch25
-rwxr-xr-xresources/scripts/download/memtest86plus8
3 files changed, 33 insertions, 20 deletions
diff --git a/resources/memtest86plus/patch/0001-config.h-beep_mode-and-baud_rate.patch b/resources/memtest86plus/patch/0001-config.h-beep_mode-and-baud_rate.patch
deleted file mode 100644
index 2fef5051..00000000
--- a/resources/memtest86plus/patch/0001-config.h-beep_mode-and-baud_rate.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.h 2020-12-14 01:27:24.300252326 +0000
-+++ config.h.new 2020-12-14 01:27:30.004252080 +0000
-@@ -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
-@@ -35,7 +35,7 @@
- #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 --git a/resources/memtest86plus/patch/0001-fix-memtest86-linker-error-during-build.patch b/resources/memtest86plus/patch/0001-fix-memtest86-linker-error-during-build.patch
new file mode 100644
index 00000000..b75e22d7
--- /dev/null
+++ b/resources/memtest86plus/patch/0001-fix-memtest86-linker-error-during-build.patch
@@ -0,0 +1,25 @@
+From bed727867b7f5bc246067a4195a96abbc82aef35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A9licien=20Pillot?= <felicien@gnu.org>
+Date: Tue, 8 Feb 2022 07:37:50 +0000
+Subject: [PATCH 1/1] fix memtest86+ linker error during build
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7732491..23ea640 100644
+--- a/Makefile
++++ b/Makefile
+@@ -75,7 +75,7 @@ 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 -fno-strict-overflow test.c
++ $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-strict-overflow -fno-stack-protector test.c
+
+ random.o: random.c
+ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
+--
+2.25.1
+
diff --git a/resources/scripts/download/memtest86plus b/resources/scripts/download/memtest86plus
index c95342a8..1b3da822 100755
--- a/resources/scripts/download/memtest86plus
+++ b/resources/scripts/download/memtest86plus
@@ -37,6 +37,14 @@ git clone https://review.coreboot.org/memtest86plus.git
(
cd "memtest86plus/"
git reset --hard a78401b9704cfdd49c89bfb31d2df08f60521d0b
+
+for patchfile in ../resources/memtest86plus/patch/*; do
+ if [ ! -f "${patchfile}" ]; then
+ continue
+ fi
+ git am "${patchfile}"
+done
+
rm -Rf .git*
)