canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
audit2
Leah Rowe 2024-06-19 14:32:42 +01:00 committed by Leah Rowe
parent 98fc84b0ed
commit c2ca92a169
15 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/coreboot/g43t_am3/target.cfg
View File

@ -2,5 +2,4 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
grub_timeout=10
grubtree="nvme"

1
config/coreboot/g43t_am3_16mb/target.cfg
View File

@ -2,6 +2,5 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
grub_timeout=10
release="n"
grubtree="nvme"

1
config/coreboot/ga_g41m_es2l/target.cfg
View File

@ -2,5 +2,4 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
grub_timeout=10
grubtree="nvme"

1
config/coreboot/kcma_d8_rdimm_16mb/target.cfg
View File

@ -4,6 +4,5 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10
grub_scan_disk="nvme ahci"
grubtree="nvme"

1
config/coreboot/kcma_d8_udimm_2mb/target.cfg
View File

@ -5,6 +5,5 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10
grub_scan_disk="nvme ahci"
grubtree="nvme"

1
config/coreboot/kfsn4_dre_1mb/target.cfg
View File

@ -3,4 +3,3 @@ xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
xlang="c"
grub_timeout=10

1
config/coreboot/kfsn4_dre_2mb/target.cfg
View File

@ -4,4 +4,3 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10

1
config/coreboot/kgpe_d16_rdimm_16mb/target.cfg
View File

@ -4,6 +4,5 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10
grub_scan_disk="nvme ahci"
grubtree="nvme"

1
config/coreboot/kgpe_d16_rdimm_2mb/target.cfg
View File

@ -4,6 +4,5 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10
grub_scan_disk="nvme ahci"
grubtree="nvme"

1
config/coreboot/kgpe_d16_udimm_16mb/target.cfg
View File

@ -5,6 +5,5 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10
grub_scan_disk="nvme ahci"
grubtree="nvme"

1
config/coreboot/kgpe_d16_udimm_2mb/target.cfg
View File

@ -5,6 +5,5 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
xlang="c"
grub_timeout=10
grub_scan_disk="nvme ahci"
grubtree="nvme"

2
config/grub/default/config/payload
View File

@ -53,7 +53,7 @@ set default="0"
if [ -f (cbfsdisk)/timeout.cfg ]; then
source (cbfsdisk)/timeout.cfg
else
set timeout=5
set timeout=8
fi
set grub_scan_disk="ahci ata"
if [ -f (cbfsdisk)/scan.cfg ]; then

2
config/grub/nvme/config/payload
View File

@ -53,7 +53,7 @@ set default="0"
if [ -f (cbfsdisk)/timeout.cfg ]; then
source (cbfsdisk)/timeout.cfg
else
set timeout=5
set timeout=8
fi
set grub_scan_disk="nvme ahci ata"
if [ -f (cbfsdisk)/scan.cfg ]; then

2
config/grub/xhci/config/payload
View File

@ -54,7 +54,7 @@ set default="0"
if [ -f (cbfsdisk)/timeout.cfg ]; then
source (cbfsdisk)/timeout.cfg
else
set timeout=5
set timeout=8
fi
set grub_scan_disk="nvme ahci ata"
if [ -f (cbfsdisk)/scan.cfg ]; then

10
script/roms
View File

@ -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}_" \