summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-16 01:11:46 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-16 01:11:46 +0100
commit6dc0515583c32cc6b43f0a50c150b88dbd683eb1 (patch)
treeaa745aa202700974c4686c9c04973052c3bc8968 /script
parent0e9b36c581e4471f6148023fdc5537b833a51a6c (diff)
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 <leah@libreboot.org>
Diffstat (limited to 'script')
-rwxr-xr-xscript/roms6
1 files changed, 3 insertions, 3 deletions
diff --git a/script/roms b/script/roms
index fe666754..ff5bec0c 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"