From 94b9bd44e4966aa3bba49e6a4ec818934cbcd045 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 16 Jun 2024 01:11:46 +0100 Subject: [PATCH] roms: further clean up build_grub_roms() the tmpcfg variable will be useful elsewhere, for the same kind of change as before. Signed-off-by: Leah Rowe --- script/roms | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/roms b/script/roms index 3574f80..feb7ec1 100755 --- a/script/roms +++ b/script/roms @@ -15,6 +15,7 @@ cfgsdir="config/coreboot" picosrc="src/pico-serprog" picosdk="src/pico-sdk" stm32src="src/stm32-vserprog" +tmpcfg="$tmpdir/tmpcfg" # Disable all payloads by default. # target.cfg files have to specifically enable [a] payload(s) @@ -250,12 +251,11 @@ build_grub_roms() # we only need insert grub.elf once, for each coreboot config: cbfs "$tmprom" "$grubelf" "$grub_cbfs" - tmpcfg="$tmpdir/tmpcfg" printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" > "$tmpcfg" || \ $err "set grub_scan_disk, $grub_scan_disk, $tmpcfg" cbfs "$tmprom" "$tmpcfg" scan.cfg raw - printf "set timeout=%s\n" "$grub_timeout" > "$tmpcfg" || \ - $err "set timeout, $grub_timeout, $tmpcfg" + + printf "set timeout=%s\n" "$grub_timeout" > "$tmpcfg" || $err "!time" [ -z "$grub_timeout" ] || cbfs "$tmprom" "$tmpcfg" timeout.cfg raw newrom="$romdir/${payload1}_${board}_${initmode}_$displaymode.rom"