summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-19 00:03:16 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-19 00:03:16 +0100
commit2d6946775e88f9e804be0b8eb2f8827d07511218 (patch)
tree0ba6e6244a1c579730bbb4e55ab97cdaf4360a78 /script
parent920e5ba2d93942e953625ebe97cfd67ae7ef9601 (diff)
roms: remove mt86bin variable
it's only meaningfully used once, so just hardcode the string, which is not set dynamically anyway. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
-rwxr-xr-xscript/roms9
1 files changed, 4 insertions, 5 deletions
diff --git a/script/roms b/script/roms
index 4f571aa1..969407c0 100755
--- a/script/roms
+++ b/script/roms
@@ -22,7 +22,7 @@ tmpcfg="$tmpdir/tmpcfg"
# Disable all payloads by default.
# target.cfg files have to specifically enable [a] payload(s)
pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t"
-pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub mt86bin"
+pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub"
v="romdir cbrom initmode displaymode cbcfg targetdir tree release ubootelf"
v="$v grub_timeout board grub_scan_disk uboot_config grubtree grubelf tmpmv"
eval "$(setvars "n" $pv)"
@@ -139,9 +139,7 @@ build_payloads()
[ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree
- mt86bin="elf/memtest86plus/memtest.bin"
- [ "$payload_memtest" != "y" ] || [ -f "$mt86bin" ] || \
- x_ ./update trees -b memtest86plus
+ [ "$payload_memtest" = "y" ] && x_ ./update trees -b memtest86plus
[ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios
if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \
@@ -187,7 +185,8 @@ build_roms()
cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
x_ cp "$_cbrom" "$cbrom"
- [ "$payload_memtest" != "y" ] || cbfs "$cbrom" "$mt86bin" img/memtest
+ [ "$payload_memtest" != "y" ] || cbfs "$cbrom"
+ "elf/memtest86plus/memtest.bin" img/memtest
[ "$payload_seabios" = "y" ] && build_seabios_roms
[ "$payload_grub" != "y" ] || build_grub_roms "$cbrom" "grub"
[ "$payload_uboot" = "y" ] || return 0