GNUBoot/gnuboot
GNUBoot
/
gnuboot
mirror of https://git.savannah.gnu.org/git/gnuboot.git
2
1
Fork 0
Code Issues Releases Activity

don't include memtest by default. make it a board.cfg option

This commit is contained in:
Leah Rowe 2021-05-22 19:21:24 +01:00
parent cfd47cc0a5
commit 52d8fccaae
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/scripts/build/boot/roms_helper
View File

@ -59,6 +59,7 @@ payload_seabios="n"
payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot menu payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot menu
payload_tianocore="n" payload_tianocore="n"
seabios_opromloadonly="0" seabios_opromloadonly="0"
payload_memtest="n"
# Override the above defaults using board.cfg # Override the above defaults using board.cfg
source "resources/coreboot/${board}/board.cfg" source "resources/coreboot/${board}/board.cfg"
if [ "${cbtree}" = "undefined" ]; then if [ "${cbtree}" = "undefined" ]; then
@ -74,6 +75,10 @@ if [ "${seabios_opromloadonly}" != "0" ] && \
[ "${seabios_opromloadonly}" != "1" ]; then [ "${seabios_opromloadonly}" != "1" ]; then
seabios_opromloadonly="0" seabios_opromloadonly="0"
fi fi
if [ "${payload_memtest}" != "n" ] && \
[ "${payload_memtest}" != "y" ]; then
payload_memtest="n"
fi
if [ "${payload_grub_withseabios}" = "y" ] \ if [ "${payload_grub_withseabios}" = "y" ] \
|| [ "${payload_grub_withtianocore}" = "y" ]; then || [ "${payload_grub_withtianocore}" = "y" ]; then
payload_grub="y" payload_grub="y"
@ -104,8 +109,10 @@ if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] \
done done
fi fi
if [ ! -f "memtest86plus/memtest" ]; then if [ "${payload_memtest}" = "y" ]; then
./build module memtest86plus if [ ! -f "memtest86plus/memtest" ]; then
./build module memtest86plus
fi
fi fi
romdir="bin/${board}" romdir="bin/${board}"
@ -398,7 +405,7 @@ mkRoms() {
mkRomWithTianocoreOnly "${corebootrom}" "${initmode}" mkRomWithTianocoreOnly "${corebootrom}" "${initmode}"
fi fi
if [ "${displaymode}" = "txtmode" ]; then if [ "${displaymode}" = "txtmode" ] && [ "${payload_memtest}" = "y" ]; then
"${cbfstool}" "${corebootrom}" add-payload -f memtest86plus/memtest -n img/memtest -c lzma "${cbfstool}" "${corebootrom}" add-payload -f memtest86plus/memtest -n img/memtest -c lzma
fi fi