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>
---
 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/hp8300cmt_16mb/target.cfg      | 1 -
 config/coreboot/hp8300usdt_16mb/target.cfg     | 1 -
 config/coreboot/hp8460pintel_8mb/target.cfg    | 1 -
 config/coreboot/hp8470pintel_16mb/target.cfg   | 1 -
 config/coreboot/hp8560w_8mb/target.cfg         | 1 -
 config/coreboot/hp9470m_16mb/target.cfg        | 1 -
 config/coreboot/kcma_d8_rdimm_16mb/target.cfg  | 1 -
 config/coreboot/kcma_d8_udimm_2mb/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 -
 22 files changed, 22 deletions(-)

(limited to 'config/coreboot')

diff --git a/config/coreboot/g43t_am3/target.cfg b/config/coreboot/g43t_am3/target.cfg
index f0e838fb..796ceabf 100644
--- a/config/coreboot/g43t_am3/target.cfg
+++ b/config/coreboot/g43t_am3/target.cfg
@@ -2,5 +2,4 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-grub_timeout=10
 grubtree="nvme"
diff --git a/config/coreboot/g43t_am3_16mb/target.cfg b/config/coreboot/g43t_am3_16mb/target.cfg
index 533d8b5a..46e8fc4f 100644
--- a/config/coreboot/g43t_am3_16mb/target.cfg
+++ b/config/coreboot/g43t_am3_16mb/target.cfg
@@ -2,6 +2,5 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-grub_timeout=10
 release="n"
 grubtree="nvme"
diff --git a/config/coreboot/ga_g41m_es2l/target.cfg b/config/coreboot/ga_g41m_es2l/target.cfg
index f0e838fb..796ceabf 100644
--- a/config/coreboot/ga_g41m_es2l/target.cfg
+++ b/config/coreboot/ga_g41m_es2l/target.cfg
@@ -2,5 +2,4 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-grub_timeout=10
 grubtree="nvme"
diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp2170p_16mb/target.cfg
+++ b/config/coreboot/hp2170p_16mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp2560p_8mb/target.cfg
+++ b/config/coreboot/hp2560p_8mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp2570p_16mb/target.cfg
+++ b/config/coreboot/hp2570p_16mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg
index 82169ae7..a2b3d31f 100644
--- a/config/coreboot/hp8200sff_4mb/target.cfg
+++ b/config/coreboot/hp8200sff_4mb/target.cfg
@@ -3,6 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg
index 82169ae7..a2b3d31f 100644
--- a/config/coreboot/hp8200sff_8mb/target.cfg
+++ b/config/coreboot/hp8200sff_8mb/target.cfg
@@ -3,6 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg
index 82169ae7..a2b3d31f 100644
--- a/config/coreboot/hp8300cmt_16mb/target.cfg
+++ b/config/coreboot/hp8300cmt_16mb/target.cfg
@@ -3,6 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp8300usdt_16mb/target.cfg
+++ b/config/coreboot/hp8300usdt_16mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/coreboot/hp8460pintel_8mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/coreboot/hp8470pintel_16mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp8560w_8mb/target.cfg b/config/coreboot/hp8560w_8mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp8560w_8mb/target.cfg
+++ b/config/coreboot/hp8560w_8mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg
index 2e48c44d..341e655e 100644
--- a/config/coreboot/hp9470m_16mb/target.cfg
+++ b/config/coreboot/hp9470m_16mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-grub_timeout=10
 grub_scan_disk="ahci"
diff --git a/config/coreboot/kcma_d8_rdimm_16mb/target.cfg b/config/coreboot/kcma_d8_rdimm_16mb/target.cfg
index 80d2018e..744b6e10 100644
--- a/config/coreboot/kcma_d8_rdimm_16mb/target.cfg
+++ b/config/coreboot/kcma_d8_rdimm_16mb/target.cfg
@@ -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"
diff --git a/config/coreboot/kcma_d8_udimm_2mb/target.cfg b/config/coreboot/kcma_d8_udimm_2mb/target.cfg
index d4079eb4..00e1d511 100644
--- a/config/coreboot/kcma_d8_udimm_2mb/target.cfg
+++ b/config/coreboot/kcma_d8_udimm_2mb/target.cfg
@@ -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"
diff --git a/config/coreboot/kfsn4_dre_1mb/target.cfg b/config/coreboot/kfsn4_dre_1mb/target.cfg
index 19c57b8d..79ca98c4 100644
--- a/config/coreboot/kfsn4_dre_1mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_1mb/target.cfg
@@ -3,4 +3,3 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 xlang="c"
-grub_timeout=10
diff --git a/config/coreboot/kfsn4_dre_2mb/target.cfg b/config/coreboot/kfsn4_dre_2mb/target.cfg
index 9bd20d45..51b50a3b 100644
--- a/config/coreboot/kfsn4_dre_2mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_2mb/target.cfg
@@ -4,4 +4,3 @@ payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
-grub_timeout=10
diff --git a/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg b/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg
index 80d2018e..744b6e10 100644
--- a/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg
+++ b/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg
@@ -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"
diff --git a/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg b/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg
index 80d2018e..744b6e10 100644
--- a/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg
+++ b/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg
@@ -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"
diff --git a/config/coreboot/kgpe_d16_udimm_16mb/target.cfg b/config/coreboot/kgpe_d16_udimm_16mb/target.cfg
index d4079eb4..00e1d511 100644
--- a/config/coreboot/kgpe_d16_udimm_16mb/target.cfg
+++ b/config/coreboot/kgpe_d16_udimm_16mb/target.cfg
@@ -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"
diff --git a/config/coreboot/kgpe_d16_udimm_2mb/target.cfg b/config/coreboot/kgpe_d16_udimm_2mb/target.cfg
index d4079eb4..00e1d511 100644
--- a/config/coreboot/kgpe_d16_udimm_2mb/target.cfg
+++ b/config/coreboot/kgpe_d16_udimm_2mb/target.cfg
@@ -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"
-- 
cgit v1.2.1