From 893e88bc814966d88a313d2c6d3a53d6ee54c9fb Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 19 Jun 2024 14:32:42 +0100
Subject: roms: don't insert timeout.cfg
this is bloat, because it's something the user can already
do at runtime configuration anyway.
set it to a reasonable default of 8 seconds instead of 5,
and don't honour the timeout variable in target.cfg.
this will be documented in the next release.
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
script/roms | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
(limited to 'script')
diff --git a/script/roms b/script/roms
index 51ce4fd7..90521041 100755
--- a/script/roms
+++ b/script/roms
@@ -17,7 +17,6 @@ rp2040x="$rp2040src/build/pico_serprog.uf2"
picosdk="src/pico-sdk"
stm32src="src/stm32-vserprog"
stm32x="$stm32src/stm32-vserprog.hex"
-tmpcfg="$tmpdir/tmpcfg"
# Disable all payloads by default.
# target.cfg files have to specifically enable [a] payload(s)
@@ -217,12 +216,9 @@ build_grub_roms()
# we only need insert grub.elf once, for each coreboot config:
cbfs "$tmprom" "$grubelf" "$grub_cbfs"
- 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 "!time"
- [ -z "$grub_timeout" ] || cbfs "$tmprom" "$tmpcfg" timeout.cfg raw
+ printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \
+ > "$tmpdir/tmpcfg" || $err "set grub_scan_disk, $grub_scan_disk"
+ cbfs "$tmprom" "$tmpdir/tmpcfg" scan.cfg raw
newrom="$romdir/${payload1}_${board}_${initmode}_$displaymode.rom"
[ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \
--
cgit v1.2.1