From 52d8fccaae2723e8c2109a84936e88cc41b39743 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 22 May 2021 19:21:24 +0100
Subject: [PATCH] don't include memtest by default. make it a board.cfg option

---
 resources/scripts/build/boot/roms_helper | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 83db0766..f3608780 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,8 +109,10 @@ if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] \
 	done
 fi
 
-if [ ! -f "memtest86plus/memtest" ]; then
-	./build module memtest86plus
+if [ "${payload_memtest}" = "y" ]; then
+	if [ ! -f "memtest86plus/memtest" ]; then
+		./build module memtest86plus
+	fi
 fi
 
 romdir="bin/${board}"
@@ -398,7 +405,7 @@ mkRoms() {
 		mkRomWithTianocoreOnly "${corebootrom}" "${initmode}"
 	fi
 
-	if [ "${displaymode}" = "txtmode" ]; then
+	if [ "${displaymode}" = "txtmode" ] && [ "${payload_memtest}" = "y" ]; then
 		"${cbfstool}" "${corebootrom}" add-payload -f memtest86plus/memtest -n img/memtest -c lzma
 	fi