memtest86+: fix build error (patch from Félicien Pillot)
parent
937590d2b1
commit
37b4500513
|
@ -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
|
|
||||||
*/
|
|
|
@ -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
|
||||||
|
|
|
@ -37,6 +37,14 @@ git clone https://review.coreboot.org/memtest86plus.git
|
||||||
(
|
(
|
||||||
cd "memtest86plus/"
|
cd "memtest86plus/"
|
||||||
git reset --hard a78401b9704cfdd49c89bfb31d2df08f60521d0b
|
git reset --hard a78401b9704cfdd49c89bfb31d2df08f60521d0b
|
||||||
|
|
||||||
|
for patchfile in ../resources/memtest86plus/patch/*; do
|
||||||
|
if [ ! -f "${patchfile}" ]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
git am "${patchfile}"
|
||||||
|
done
|
||||||
|
|
||||||
rm -Rf .git*
|
rm -Rf .git*
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue