diff options
| -rwxr-xr-x | script/roms | 9 |
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 |