summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <vimuser@noreply.codeberg.org>2023-08-22 13:47:40 +0000
committerLeah Rowe <vimuser@noreply.codeberg.org>2023-08-22 13:47:40 +0000
commitdfb93166bbb69745e7f08a469cca98c7ed45aa09 (patch)
tree34d6f3ea5e461d7a773df230df09602a35668499
parent1bd842097b544d8fee6416c74fb33dd0dcfac460 (diff)
parentfa926632148b78ed327f5d674dad9a5ee243af9a (diff)
Merge pull request 'memtest86+ v6.20' (#116) from Riku_V/lbmk:memtest into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/116
-rw-r--r--resources/git/revisions4
-rw-r--r--resources/memtest86plus/patches/0001-fix-memtest86-linker-error-during-build.patch25
-rwxr-xr-xresources/scripts/build/boot/roms_helper15
-rwxr-xr-xresources/scripts/build/src/for6
4 files changed, 13 insertions, 37 deletions
diff --git a/resources/git/revisions b/resources/git/revisions
index 533127e2..c3a7fe72 100644
--- a/resources/git/revisions
+++ b/resources/git/revisions
@@ -41,9 +41,9 @@
}
{memtest86plus}{
- rev: a78401b9704cfdd49c89bfb31d2df08f60521d0b
+ rev: 5dcd424ea7afb857c1171e747ef064d98d26afeb
loc: memtest86plus
- url: https://review.coreboot.org/memtest86plus.git
+ url: https://github.com/memtest86plus/memtest86plus.git
}
{seabios}{
diff --git a/resources/memtest86plus/patches/0001-fix-memtest86-linker-error-during-build.patch b/resources/memtest86plus/patches/0001-fix-memtest86-linker-error-during-build.patch
deleted file mode 100644
index b75e22d7..00000000
--- a/resources/memtest86plus/patches/0001-fix-memtest86-linker-error-during-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 8438fffc..f78c7cc8 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -7,6 +7,7 @@
# <vitali64pmemail@protonmail.com>
# Copyright (C) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
# Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com>
+# Copyright (C) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
#
# 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
@@ -100,8 +101,7 @@ uboot_config="undefined"
[ "${arch}" = "undefined" ] && \
err "Target '${board}' does not define a CPU type. Skipping build."
-[ "${payload_memtest}" != "n" ] && \
- [ "${payload_memtest}" != "y" ] && \
+[ "${payload_memtest}" != "y" ] && \
payload_memtest="n"
[ "${payload_grub_withseabios}" = "y" ] && \
payload_grub="y"
@@ -169,8 +169,9 @@ if [ ! -f "${seavgabiosrom}" ] \
./handle config file -b seabios
fi
-[ "${payload_memtest}" = "y" ] && [ ! -f "memtest86plus/memtest" ] && \
- ./build src for -b memtest86plus
+memtest_bin="memtest86plus/build${arch#*_}/memtest.bin"
+[ "${payload_memtest}" = "y" ] && [ ! -f "${memtest_bin}" ] && \
+ ./build src for -b ${memtest_bin%/*}
[ -d "${romdir}/" ] || mkdir -p "${romdir}/"
rm -f "${romdir}"/*
@@ -492,10 +493,10 @@ mkRoms()
corebootrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
cp "${_corebootrom}" "${corebootrom}"
- if [ "${displaymode}" = "txtmode" ] && \
- [ "${payload_memtest}" = "y" ]; then
+ if [ "${payload_memtest}" = "y" ]; then
"${cbfstool}" "${corebootrom}" add-payload \
- -f memtest86plus/memtest -n img/memtest -c lzma || exit 1
+ -f ${memtest_bin} -n img/memtest \
+ -c lzma || exit 1
fi
if [ "${payload_seabios}" = "y" ]; then
diff --git a/resources/scripts/build/src/for b/resources/scripts/build/src/for
index 032895e2..6761f160 100755
--- a/resources/scripts/build/src/for
+++ b/resources/scripts/build/src/for
@@ -44,9 +44,9 @@ main()
[ -z "${project}" ] && err "project name not specified"
[ "${project}" = "ich9utils" ] && project="util/ich9utils"
- [ -d "${project}" ] || ./fetch "${project}" || \
- err "Cannot download project, ${project}"
- [ -d "${project}" ] || err "Project, ${project}, not downloaded"
+ [ -d "${project}" ] || ./fetch "${project%/*}" \
+ || err "Cannot download project, ${project%/*}"
+ [ -d "${project}" ] || err "Project, ${project%/*}, not downloaded"
if [ "${project}" = "uefitool" ]; then
(