13 files changed, 9 insertions, 26 deletions

diff --git a/resources/coreboot/d510mo_16mb/target.cfg b/resources/coreboot/d510mo_16mb/target.cfg
index dec7489a..838b2a05 100644
--- a/resources/coreboot/d510mo_16mb/target.cfg
+++ b/resources/coreboot/d510mo_16mb/target.cfg
@@ -1,9 +1,8 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 microcode_required="n"
 blobs_required="n"
diff --git a/resources/coreboot/g43t-am3/target.cfg b/resources/coreboot/g43t-am3/target.cfg
index c87b3b2e..9835ea10 100644
--- a/resources/coreboot/g43t-am3/target.cfg
+++ b/resources/coreboot/g43t-am3/target.cfg
@@ -1,8 +1,6 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="n"
-payload_grub_withseabios="n"
 payload_seabios="y"
 microcode_required="n"
 blobs_required="n"
diff --git a/resources/coreboot/g43t-am3_16mb/target.cfg b/resources/coreboot/g43t-am3_16mb/target.cfg
index c51f117b..249d9e68 100644
--- a/resources/coreboot/g43t-am3_16mb/target.cfg
+++ b/resources/coreboot/g43t-am3_16mb/target.cfg
@@ -1,8 +1,6 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="n"
-payload_grub_withseabios="n"
 payload_seabios="y"
 payload_memtest="n"
 microcode_required="n"
diff --git a/resources/coreboot/ga-g41m-es2l/target.cfg b/resources/coreboot/ga-g41m-es2l/target.cfg
index 81f11923..2eaad4a3 100644
--- a/resources/coreboot/ga-g41m-es2l/target.cfg
+++ b/resources/coreboot/ga-g41m-es2l/target.cfg
@@ -1,8 +1,6 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="n"
-payload_grub_withseabios="n"
 payload_seabios="y"
 grub_scan_disk="ata"
 microcode_required="n"
diff --git a/resources/coreboot/hp8200sff_4mb/target.cfg b/resources/coreboot/hp8200sff_4mb/target.cfg
index fb07b8fe..7b7bb131 100644
--- a/resources/coreboot/hp8200sff_4mb/target.cfg
+++ b/resources/coreboot/hp8200sff_4mb/target.cfg
@@ -1,9 +1,8 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 microcode_required="n"
diff --git a/resources/coreboot/hp8200sff_8mb/target.cfg b/resources/coreboot/hp8200sff_8mb/target.cfg
index fb07b8fe..7b7bb131 100644
--- a/resources/coreboot/hp8200sff_8mb/target.cfg
+++ b/resources/coreboot/hp8200sff_8mb/target.cfg
@@ -1,9 +1,8 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 microcode_required="n"
diff --git a/resources/coreboot/hp8300usdt_16mb/target.cfg b/resources/coreboot/hp8300usdt_16mb/target.cfg
index fb07b8fe..7b7bb131 100644
--- a/resources/coreboot/hp8300usdt_16mb/target.cfg
+++ b/resources/coreboot/hp8300usdt_16mb/target.cfg
@@ -1,9 +1,8 @@
 tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 microcode_required="n"
diff --git a/resources/coreboot/kfsn4-dre_1mb/target.cfg b/resources/coreboot/kfsn4-dre_1mb/target.cfg
index c7bf7741..e7863a3e 100644
--- a/resources/coreboot/kfsn4-dre_1mb/target.cfg
+++ b/resources/coreboot/kfsn4-dre_1mb/target.cfg
@@ -1,8 +1,6 @@
 tree="fam15h_udimm"
 romtype="normal"
 arch="x86_64"
-payload_grub="n"
-payload_grub_withseabios="n"
 payload_seabios="y"
 payload_memtest="y"
 crossgcc_ada="n"
diff --git a/resources/coreboot/kfsn4-dre_2mb/target.cfg b/resources/coreboot/kfsn4-dre_2mb/target.cfg
index c7bf7741..e9d7512a 100644
--- a/resources/coreboot/kfsn4-dre_2mb/target.cfg
+++ b/resources/coreboot/kfsn4-dre_2mb/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_udimm"
 romtype="normal"
 arch="x86_64"
-payload_grub="n"
-payload_grub_withseabios="n"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 crossgcc_ada="n"
 microcode_required="n"
diff --git a/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg
index 0cbae6f0..5fe0f9e6 100644
--- a/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg
+++ b/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_rdimm"
 romtype="d8d16sas"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 crossgcc_ada="n"
 microcode_required="n"
diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg
index 0cbae6f0..5fe0f9e6 100644
--- a/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg
+++ b/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_rdimm"
 romtype="d8d16sas"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 crossgcc_ada="n"
 microcode_required="n"
diff --git a/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg b/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg
index 3600d6cb..b4215683 100644
--- a/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg
+++ b/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_udimm"
 romtype="d8d16sas"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 crossgcc_ada="n"
 microcode_required="n"
diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg b/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg
index 3600d6cb..b4215683 100644
--- a/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg
+++ b/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_udimm"
 romtype="d8d16sas"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 crossgcc_ada="n"
 microcode_required="n"