summaryrefslogtreecommitdiff
path: root/config/coreboot
diff options
context:
space:
mode:
Diffstat (limited to 'config/coreboot')
-rw-r--r--config/coreboot/d510mo/target.cfg2
-rw-r--r--config/coreboot/d945gclf_512kb/target.cfg3
-rw-r--r--config/coreboot/d945gclf_8mb/target.cfg4
-rw-r--r--config/coreboot/dell9020mt-nri_12mb/target.cfg1
-rw-r--r--config/coreboot/dell9020sff-nri_12mb/target.cfg1
-rw-r--r--config/coreboot/e5420_6mb/target.cfg5
-rw-r--r--config/coreboot/e5520_6mb/target.cfg5
-rw-r--r--config/coreboot/e5530_12mb/target.cfg5
-rw-r--r--config/coreboot/e6400_4mb/target.cfg5
-rw-r--r--config/coreboot/e6400nvidia_4mb/target.cfg5
-rw-r--r--config/coreboot/e6420_10mb/target.cfg5
-rw-r--r--config/coreboot/e6430_12mb/target.cfg5
-rw-r--r--config/coreboot/e6520_10mb/target.cfg5
-rw-r--r--config/coreboot/e6530_12mb/target.cfg5
-rw-r--r--config/coreboot/haswell/target.cfg1
-rw-r--r--config/coreboot/hp2170p_16mb/target.cfg3
-rw-r--r--config/coreboot/hp2560p_8mb/target.cfg3
-rw-r--r--config/coreboot/hp2570p_16mb/target.cfg3
-rw-r--r--config/coreboot/hp820g2_12mb/target.cfg3
-rw-r--r--config/coreboot/hp8460pintel_8mb/target.cfg3
-rw-r--r--config/coreboot/hp8470pintel_16mb/target.cfg3
-rw-r--r--config/coreboot/hp8560w_8mb/target.cfg2
-rw-r--r--config/coreboot/hp9470m_16mb/target.cfg3
-rw-r--r--config/coreboot/kcma-d8-rdimm_16mb/target.cfg5
-rw-r--r--config/coreboot/kcma-d8-rdimm_2mb/target.cfg4
-rw-r--r--config/coreboot/kcma-d8-udimm_16mb/target.cfg5
-rw-r--r--config/coreboot/kcma-d8-udimm_2mb/target.cfg5
-rw-r--r--config/coreboot/macbook11/target.cfg3
-rw-r--r--config/coreboot/macbook11_16mb/target.cfg3
-rw-r--r--config/coreboot/macbook21/target.cfg3
-rw-r--r--config/coreboot/macbook21_16mb/target.cfg3
-rw-r--r--config/coreboot/r400_16mb/target.cfg3
-rw-r--r--config/coreboot/r400_4mb/target.cfg3
-rw-r--r--config/coreboot/r400_8mb/target.cfg3
-rw-r--r--config/coreboot/r500_4mb/target.cfg3
-rw-r--r--config/coreboot/t1650_12mb/target.cfg1
-rw-r--r--config/coreboot/t400_16mb/target.cfg3
-rw-r--r--config/coreboot/t400_4mb/target.cfg3
-rw-r--r--config/coreboot/t400_8mb/target.cfg3
-rw-r--r--config/coreboot/t420_8mb/target.cfg3
-rw-r--r--config/coreboot/t420s_8mb/target.cfg3
-rw-r--r--config/coreboot/t430_12mb/target.cfg3
-rw-r--r--config/coreboot/t440plibremrc_12mb/target.cfg3
-rw-r--r--config/coreboot/t500_16mb/target.cfg3
-rw-r--r--config/coreboot/t500_4mb/target.cfg3
-rw-r--r--config/coreboot/t500_8mb/target.cfg3
-rw-r--r--config/coreboot/t520_8mb/target.cfg3
-rw-r--r--config/coreboot/t530_12mb/target.cfg3
-rw-r--r--config/coreboot/t60_16mb_intelgpu/target.cfg3
-rw-r--r--config/coreboot/t60_intelgpu/target.cfg3
-rw-r--r--config/coreboot/w500_16mb/target.cfg3
-rw-r--r--config/coreboot/w500_4mb/target.cfg3
-rw-r--r--config/coreboot/w500_8mb/target.cfg3
-rw-r--r--config/coreboot/w530_12mb/target.cfg3
-rw-r--r--config/coreboot/w541_12mb/target.cfg3
-rw-r--r--config/coreboot/x200_16mb/target.cfg3
-rw-r--r--config/coreboot/x200_4mb/target.cfg3
-rw-r--r--config/coreboot/x200_8mb/target.cfg3
-rw-r--r--config/coreboot/x220_8mb/target.cfg3
-rw-r--r--config/coreboot/x230_12mb/target.cfg3
-rw-r--r--config/coreboot/x230_16mb/target.cfg3
-rw-r--r--config/coreboot/x230t_12mb/target.cfg3
-rw-r--r--config/coreboot/x230t_16mb/target.cfg3
-rw-r--r--config/coreboot/x301_16mb/target.cfg3
-rw-r--r--config/coreboot/x301_4mb/target.cfg3
-rw-r--r--config/coreboot/x301_8mb/target.cfg3
-rw-r--r--config/coreboot/x60/target.cfg3
-rw-r--r--config/coreboot/x60_16mb/target.cfg3
68 files changed, 69 insertions, 151 deletions
diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg
index 65330b75..2be9c81b 100644
--- a/config/coreboot/d510mo/target.cfg
+++ b/config/coreboot/d510mo/target.cfg
@@ -1,7 +1,5 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
payload_memtest="y"
release="n"
diff --git a/config/coreboot/d945gclf_512kb/target.cfg b/config/coreboot/d945gclf_512kb/target.cfg
index 5843b4e7..cc133e56 100644
--- a/config/coreboot/d945gclf_512kb/target.cfg
+++ b/config/coreboot/d945gclf_512kb/target.cfg
@@ -1,7 +1,4 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="n"
release="n"
diff --git a/config/coreboot/d945gclf_8mb/target.cfg b/config/coreboot/d945gclf_8mb/target.cfg
index 5843b4e7..38e5763e 100644
--- a/config/coreboot/d945gclf_8mb/target.cfg
+++ b/config/coreboot/d945gclf_8mb/target.cfg
@@ -1,7 +1,5 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="n"
+payload_seabios_withgrub="y"
release="n"
diff --git a/config/coreboot/dell9020mt-nri_12mb/target.cfg b/config/coreboot/dell9020mt-nri_12mb/target.cfg
index 37d8f553..1567769d 100644
--- a/config/coreboot/dell9020mt-nri_12mb/target.cfg
+++ b/config/coreboot/dell9020mt-nri_12mb/target.cfg
@@ -2,6 +2,5 @@ tree="haswell"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/dell9020sff-nri_12mb/target.cfg b/config/coreboot/dell9020sff-nri_12mb/target.cfg
index 37d8f553..1567769d 100644
--- a/config/coreboot/dell9020sff-nri_12mb/target.cfg
+++ b/config/coreboot/dell9020sff-nri_12mb/target.cfg
@@ -2,6 +2,5 @@ tree="haswell"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e5420_6mb/target.cfg b/config/coreboot/e5420_6mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e5420_6mb/target.cfg
+++ b/config/coreboot/e5420_6mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e5520_6mb/target.cfg b/config/coreboot/e5520_6mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e5520_6mb/target.cfg
+++ b/config/coreboot/e5520_6mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e5530_12mb/target.cfg b/config/coreboot/e5530_12mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e5530_12mb/target.cfg
+++ b/config/coreboot/e5530_12mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg
index 3a458ee4..8eeb3443 100644
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/coreboot/e6400_4mb/target.cfg
@@ -1,9 +1,6 @@
tree="dell"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e6400nvidia_4mb/target.cfg b/config/coreboot/e6400nvidia_4mb/target.cfg
index 3a458ee4..8eeb3443 100644
--- a/config/coreboot/e6400nvidia_4mb/target.cfg
+++ b/config/coreboot/e6400nvidia_4mb/target.cfg
@@ -1,9 +1,6 @@
tree="dell"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e6420_10mb/target.cfg b/config/coreboot/e6420_10mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e6420_10mb/target.cfg
+++ b/config/coreboot/e6420_10mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/coreboot/e6430_12mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e6430_12mb/target.cfg
+++ b/config/coreboot/e6430_12mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e6520_10mb/target.cfg b/config/coreboot/e6520_10mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e6520_10mb/target.cfg
+++ b/config/coreboot/e6520_10mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/coreboot/e6530_12mb/target.cfg
index 03fd230b..341e655e 100644
--- a/config/coreboot/e6530_12mb/target.cfg
+++ b/config/coreboot/e6530_12mb/target.cfg
@@ -1,9 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="n"
-payload_grub_withseabios="n"
payload_seabios="y"
-payload_memtest="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
+payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/haswell/target.cfg b/config/coreboot/haswell/target.cfg
index a38399e4..69f9bd39 100644
--- a/config/coreboot/haswell/target.cfg
+++ b/config/coreboot/haswell/target.cfg
@@ -1,3 +1,2 @@
tree="haswell"
rev="b7341da19133991efd29880849bdaab29a6e243d"
-xarch="i386-elf"
diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg
index fee132f4..0badb4fb 100644
--- a/config/coreboot/hp2170p_16mb/target.cfg
+++ b/config/coreboot/hp2170p_16mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="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 fee132f4..0badb4fb 100644
--- a/config/coreboot/hp2560p_8mb/target.cfg
+++ b/config/coreboot/hp2560p_8mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="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 fee132f4..0badb4fb 100644
--- a/config/coreboot/hp2570p_16mb/target.cfg
+++ b/config/coreboot/hp2570p_16mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
grub_timeout=10
diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/coreboot/hp820g2_12mb/target.cfg
index 06f3025c..dbcf5a1c 100644
--- a/config/coreboot/hp820g2_12mb/target.cfg
+++ b/config/coreboot/hp820g2_12mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
release="n"
diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg
index fee132f4..0badb4fb 100644
--- a/config/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/coreboot/hp8460pintel_8mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
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 fee132f4..0badb4fb 100644
--- a/config/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/coreboot/hp8470pintel_16mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
grub_timeout=10
diff --git a/config/coreboot/hp8560w_8mb/target.cfg b/config/coreboot/hp8560w_8mb/target.cfg
index ae56c735..0badb4fb 100644
--- a/config/coreboot/hp8560w_8mb/target.cfg
+++ b/config/coreboot/hp8560w_8mb/target.cfg
@@ -1,7 +1,7 @@
tree="default"
xarch="i386-elf"
+payload_seabios="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="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 fee132f4..0badb4fb 100644
--- a/config/coreboot/hp9470m_16mb/target.cfg
+++ b/config/coreboot/hp9470m_16mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
grub_timeout=10
diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
index d5d37291..ef9037ec 100644
--- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
+++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
@@ -1,7 +1,8 @@
tree="fam15h_rdimm"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
+grub_scan_disk="ahci"
xlang="c"
+grub_timeout=10
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
index d5d37291..641194a7 100644
--- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
+++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
@@ -1,7 +1,7 @@
tree="fam15h_rdimm"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
+grub_scan_disk="ahci"
xlang="c"
diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg
index 35354c26..d1b31cb5 100644
--- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg
+++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg
@@ -1,8 +1,9 @@
tree="fam15h_udimm"
xtree="fam15h_rdimm"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
+grub_scan_disk="ahci"
xlang="c"
+grub_timout=10
diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg
index 35354c26..4940ede3 100644
--- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg
+++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg
@@ -1,8 +1,9 @@
tree="fam15h_udimm"
xtree="fam15h_rdimm"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
+grub_scan_disk="ahci"
xlang="c"
+grub_timeout=10
diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg
index dcf5d1de..043bd365 100644
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/coreboot/macbook11/target.cfg
@@ -1,6 +1,5 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg
index dcf5d1de..043bd365 100644
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/coreboot/macbook11_16mb/target.cfg
@@ -1,6 +1,5 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg
index bb56ec25..12e51f9b 100644
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/coreboot/macbook21/target.cfg
@@ -1,7 +1,6 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg
index bb56ec25..12e51f9b 100644
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/coreboot/macbook21_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/coreboot/r400_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/coreboot/r400_4mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/coreboot/r400_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/coreboot/r500_4mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg
index e6d3bec6..341e655e 100644
--- a/config/coreboot/t1650_12mb/target.cfg
+++ b/config/coreboot/t1650_12mb/target.cfg
@@ -2,6 +2,5 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-payload_seabios_grubonly="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/coreboot/t400_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/coreboot/t400_4mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/coreboot/t400_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t420_8mb/target.cfg b/config/coreboot/t420_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t420_8mb/target.cfg
+++ b/config/coreboot/t420_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/coreboot/t420s_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t420s_8mb/target.cfg
+++ b/config/coreboot/t420s_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t430_12mb/target.cfg b/config/coreboot/t430_12mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t430_12mb/target.cfg
+++ b/config/coreboot/t430_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg
index 8bb575a9..1567769d 100644
--- a/config/coreboot/t440plibremrc_12mb/target.cfg
+++ b/config/coreboot/t440plibremrc_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="haswell"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/coreboot/t500_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/coreboot/t500_4mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/coreboot/t500_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t520_8mb/target.cfg b/config/coreboot/t520_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t520_8mb/target.cfg
+++ b/config/coreboot/t520_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t530_12mb/target.cfg b/config/coreboot/t530_12mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/t530_12mb/target.cfg
+++ b/config/coreboot/t530_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg
index 2daf00f7..f8a9c2a2 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@@ -1,7 +1,6 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
grub_scan_disk="ahci"
grub_background="background1024x768.png"
diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg
index 2daf00f7..f8a9c2a2 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@@ -1,7 +1,6 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
grub_scan_disk="ahci"
grub_background="background1024x768.png"
diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/coreboot/w500_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/coreboot/w500_4mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/coreboot/w500_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/w530_12mb/target.cfg b/config/coreboot/w530_12mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/w530_12mb/target.cfg
+++ b/config/coreboot/w530_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg
index 8bb575a9..1567769d 100644
--- a/config/coreboot/w541_12mb/target.cfg
+++ b/config/coreboot/w541_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="haswell"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/coreboot/x200_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/coreboot/x200_4mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/coreboot/x200_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x220_8mb/target.cfg b/config/coreboot/x220_8mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x220_8mb/target.cfg
+++ b/config/coreboot/x220_8mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x230_12mb/target.cfg b/config/coreboot/x230_12mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x230_12mb/target.cfg
+++ b/config/coreboot/x230_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x230_16mb/target.cfg b/config/coreboot/x230_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x230_16mb/target.cfg
+++ b/config/coreboot/x230_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/coreboot/x230t_12mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x230t_12mb/target.cfg
+++ b/config/coreboot/x230t_12mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/coreboot/x230t_16mb/target.cfg
index 8688df3f..341e655e 100644
--- a/config/coreboot/x230t_16mb/target.cfg
+++ b/config/coreboot/x230t_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg
index 06f3025c..dbcf5a1c 100644
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/coreboot/x301_16mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
release="n"
diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg
index 06f3025c..dbcf5a1c 100644
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/coreboot/x301_4mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
release="n"
diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg
index 06f3025c..dbcf5a1c 100644
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/coreboot/x301_8mb/target.cfg
@@ -1,8 +1,7 @@
tree="default"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
release="n"
diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg
index 2daf00f7..f8a9c2a2 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@@ -1,7 +1,6 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
grub_scan_disk="ahci"
grub_background="background1024x768.png"
diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg
index 2daf00f7..f8a9c2a2 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@@ -1,7 +1,6 @@
tree="i945"
xarch="i386-elf"
-payload_grub="y"
-payload_grub_withseabios="y"
payload_seabios="y"
+payload_seabios_withgrub="y"
grub_scan_disk="ahci"
grub_background="background1024x768.png"