From 68d3c9372af6eda1bd122aa92e6a08c32cfa2202 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 1 Nov 2021 02:51:10 +0000
Subject: Revert "nuke memtest86+"

This reverts commit 84a1bc502b1f296d8ad6389b9e38aa3e0ca94958.
---
 resources/scripts/build/boot/roms_helper | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'resources/scripts/build/boot')

diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index c493ad58..a4d5ff32 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -59,6 +59,7 @@ payload_seabios="n"
 payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot menu
 payload_tianocore="n"
 seabios_opromloadonly="0"
+payload_memtest="n"
 # Override the above defaults using board.cfg
 source "resources/coreboot/${board}/board.cfg"
 if [ "${cbtree}" = "undefined" ]; then
@@ -74,6 +75,10 @@ if [ "${seabios_opromloadonly}" != "0" ] && \
 		[ "${seabios_opromloadonly}" != "1" ]; then
 	seabios_opromloadonly="0"
 fi
+if [ "${payload_memtest}" != "n" ] && \
+		[ "${payload_memtest}" != "y" ]; then
+	payload_memtest="n"
+fi
 if [ "${payload_grub_withseabios}" = "y" ] \
 		|| [ "${payload_grub_withtianocore}" = "y" ]; then
 	payload_grub="y"
@@ -104,6 +109,12 @@ if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] \
 	done
 fi
 
+if [ "${payload_memtest}" = "y" ]; then
+	if [ ! -f "memtest86plus/memtest" ]; then
+		./build module memtest86plus
+	fi
+fi
+
 romdir="bin/${board}"
 cbdir="coreboot/${board}"
 if [ "${board}" != "${cbtree}" ]; then
@@ -415,6 +426,10 @@ mkRoms() {
 		mkRomWithTianocoreOnly "${corebootrom}" "${initmode}"
 	fi
 
+	if [ "${displaymode}" = "txtmode" ] && [ "${payload_memtest}" = "y" ]; then
+		"${cbfstool}" "${corebootrom}" add-payload -f memtest86plus/memtest -n img/memtest -c lzma
+	fi
+
 	if [ "${payload_seabios}" = "y" ]; then
 		if [ "${payload_seabios_withgrub}" = "n" ]; then
 			tmpseabiosrom="$(make_seabios_rom "${corebootrom}" "fallback/payload" "${seabios_opromloadonly}" "${initmode}" "${cbfstool}")"
-- 
cgit v1.2.1