From a69e8548b360e288b3e534cfbc201a5fb410e885 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 8 Sep 2023 23:48:06 +0100 Subject: set grub.cfg timeout to 5s (10 on some boards) target.cfg can now specify e.g. grub_timeout=20 this would then be inserted as timeout.cfg in cbfs, containing the instruction: set timeout=20 HP laptops need a bit of extra time, due to the delay caused by the EC bug workaround deployed in GRUB desktops in general need extra time. this too is set to 10s, like the HP laptops. only insert timeout.cfg if actually needed (declared in target.cfg), otherwise grub.cfg will default to 5s Signed-off-by: Leah Rowe --- config/coreboot/g43t-am3/target.cfg | 1 + config/coreboot/g43t-am3_16mb/target.cfg | 1 + config/coreboot/ga-g41m-es2l/target.cfg | 1 + config/coreboot/hp2170p_16mb/target.cfg | 1 + config/coreboot/hp2560p_8mb/target.cfg | 1 + config/coreboot/hp2570p_16mb/target.cfg | 1 + config/coreboot/hp8200sff_4mb/target.cfg | 1 + config/coreboot/hp8200sff_8mb/target.cfg | 1 + config/coreboot/hp8300usdt_16mb/target.cfg | 1 + config/coreboot/hp8470pintel_16mb/target.cfg | 1 + config/coreboot/hp9470m_16mb/target.cfg | 1 + config/coreboot/kfsn4-dre_1mb/target.cfg | 1 + config/coreboot/kfsn4-dre_2mb/target.cfg | 1 + config/coreboot/kgpe-d16-rdimm_16mb/target.cfg | 1 + config/coreboot/kgpe-d16-rdimm_2mb/target.cfg | 1 + config/coreboot/kgpe-d16-udimm_16mb/target.cfg | 1 + config/coreboot/kgpe-d16-udimm_2mb/target.cfg | 1 + config/grub/config/grub.cfg | 6 +++++- 18 files changed, 22 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg index a71ee06d..facdd5b5 100644 --- a/config/coreboot/g43t-am3/target.cfg +++ b/config/coreboot/g43t-am3/target.cfg @@ -5,3 +5,4 @@ payload_seabios="y" payload_memtest="y" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg index a71ee06d..facdd5b5 100644 --- a/config/coreboot/g43t-am3_16mb/target.cfg +++ b/config/coreboot/g43t-am3_16mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios="y" payload_memtest="y" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg index 7d15972b..2bdf0e76 100644 --- a/config/coreboot/ga-g41m-es2l/target.cfg +++ b/config/coreboot/ga-g41m-es2l/target.cfg @@ -6,3 +6,4 @@ payload_memtest="y" grub_scan_disk="ata" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg index f5dfa8d8..784e020b 100644 --- a/config/coreboot/hp2170p_16mb/target.cfg +++ b/config/coreboot/hp2170p_16mb/target.cfg @@ -6,3 +6,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg index f5dfa8d8..784e020b 100644 --- a/config/coreboot/hp2560p_8mb/target.cfg +++ b/config/coreboot/hp2560p_8mb/target.cfg @@ -6,3 +6,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg index f5dfa8d8..784e020b 100644 --- a/config/coreboot/hp2570p_16mb/target.cfg +++ b/config/coreboot/hp2570p_16mb/target.cfg @@ -6,3 +6,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index 3b1ace62..1467dcd2 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index 3b1ace62..1467dcd2 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg index 3b1ace62..1467dcd2 100644 --- a/config/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/coreboot/hp8300usdt_16mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg index f5dfa8d8..784e020b 100644 --- a/config/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/coreboot/hp8470pintel_16mb/target.cfg @@ -6,3 +6,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg index f5dfa8d8..784e020b 100644 --- a/config/coreboot/hp9470m_16mb/target.cfg +++ b/config/coreboot/hp9470m_16mb/target.cfg @@ -6,3 +6,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" +grub_timeout=10 diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg index e7863a3e..4f009b44 100644 --- a/config/coreboot/kfsn4-dre_1mb/target.cfg +++ b/config/coreboot/kfsn4-dre_1mb/target.cfg @@ -6,3 +6,4 @@ payload_memtest="y" crossgcc_ada="n" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg index e9d7512a..b13f2309 100644 --- a/config/coreboot/kfsn4-dre_2mb/target.cfg +++ b/config/coreboot/kfsn4-dre_2mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" crossgcc_ada="n" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg index 5fe0f9e6..8e768bba 100644 --- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" crossgcc_ada="n" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg index 5fe0f9e6..8e768bba 100644 --- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" crossgcc_ada="n" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg index b4215683..c17e207a 100644 --- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" crossgcc_ada="n" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg index b4215683..c17e207a 100644 --- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" crossgcc_ada="n" microcode_required="n" blobs_required="n" +grub_timeout=10 diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg index 586eb145..64fe9b3d 100644 --- a/config/grub/config/grub.cfg +++ b/config/grub/config/grub.cfg @@ -26,7 +26,11 @@ elif [ -f (cbfsdisk)/background.jpg ]; then fi set default="0" -set timeout=30 +if [ -f (cbfsdisk)/timeout.cfg ]; then + source (cbfsdisk)/timeout.cfg +else + set timeout=5 +fi set pager=1 set grub_scan_disk="both" if [ -f (cbfsdisk)/scan.cfg ]; then -- cgit v1.2.1