roms: only support SeaBIOS/SeaGRUB on x86

Never, ever build images where GRUB is the primary payload.

These options have been removed from target.cfg handling:

* seabios_withgrub
* grub_withseabios

The "payload_grub" variable now does the same thing as
the old "seabios_withgrub" variable, if set.

The "grubonly" configuration is retained, and enabled by
default when SeaGRUB is enabled (non-grubonly also available).

Due to lbmk issue #216, it is no longer Libreboot policy to
make GRUB the primary payload on any board. GRUB's sheer size
and complexity, plus the large number of memory corruption issues
similar to it that *have* been fixed over the years, tells me
that GRUB is a liability when it is the primary payload.

SeaBIOS is a much safer payload to run as primary, on x86, due
to its smaller size and much more conservative development; it
is simply far less likely to break.

If GRUB breaks in the future, the user's machine is not
bricked. This is because SeaBIOS is the default payload.

Since I no longer wish to ever provide GRUB as a primary
payload, supporting it in lbmk adds needless bloat that
will later probably break anyway due to lack of testing,
so let's just assume SeaGRUB in all cases where the user
wants to use a GRUB payload.

You can mitigate potential security issues with SeaBIOS
by disabling option ROM execution, which can be done at
runtime by inserting integers into CBFS. The SeaBIOS
documentation says how to do this.

Libreboot's GRUB hardening guide still says how to add
a bootorder file in CBFS, making SeaBIOS only load GRUB
from CBFS, and nothing else. This, combined with the
disablement of option ROM execution (if using Intel
graphics), pretty much provides the same security benefits
as GRUB-as-primary, for example when setting a GRUB password
and GPG checks, with encrypted /boot as in the hardening guide.

Signed-off-by: Leah Rowe <leah@libreboot.org>

config/coreboot/d510mo_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 release="n"

config/coreboot/d945gclf_8mb/target.cfg

@@ -1,5 +1,5 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 release="n"

config/coreboot/dell9020mt_nri_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"

config/coreboot/dell9020sff_nri_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"

config/coreboot/e5420_6mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/e5520_6mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/e5530_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/e6400_4mb/target.cfg

@@ -1,7 +1,7 @@
 tree="dell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="e6400"

config/coreboot/e6400nvidia_4mb/target.cfg

@@ -1,7 +1,7 @@
 tree="dell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="e6400"

config/coreboot/e6420_10mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/e6430_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/e6520_10mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/e6530_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/hp2170p_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2170p"

config/coreboot/hp2560p_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2560p"

config/coreboot/hp2570p_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2570p"

config/coreboot/hp8200sff_4mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"

config/coreboot/hp8200sff_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"

config/coreboot/hp820g2_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="nvme ahci"

config/coreboot/hp8300cmt_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"

config/coreboot/hp8300usdt_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/hp8460pintel_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8460pintel"

config/coreboot/hp8470pintel_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8470pintel"

config/coreboot/hp8560w_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8560w"

config/coreboot/hp9470m_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp9470m"

config/coreboot/kcma_d8-udimm_16mb/target.cfg

@@ -2,7 +2,7 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_timout=10

config/coreboot/kcma_d8_rdimm_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/kcma_d8_rdimm_2mb/target.cfg

@@ -1,7 +1,7 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/kcma_d8_udimm_2mb/target.cfg

@@ -2,7 +2,7 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/kfsn4_dre_2mb/target.cfg

@@ -1,6 +1,6 @@
 tree="fam15h_udimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"

config/coreboot/kgpe_d16_rdimm_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/kgpe_d16_rdimm_2mb/target.cfg

@@ -1,7 +1,7 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/kgpe_d16_udimm_16mb/target.cfg

@@ -2,7 +2,7 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/kgpe_d16_udimm_2mb/target.cfg

@@ -2,7 +2,7 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"

config/coreboot/macbook11/target.cfg

@@ -1,5 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 grub_scan_disk="ahci"

config/coreboot/macbook11_16mb/target.cfg

@@ -1,5 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 scan_scan_disk="ahci"

config/coreboot/macbook21/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/macbook21_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/qemu_x86_12mb/target.cfg

@@ -1,6 +1,5 @@
 tree="default"
 xarch="i386-elf"
 payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"

config/coreboot/r400_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/r400_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/r400_8mb/target.cfg

@@ -1,5 +1,5 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"

config/coreboot/r500_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t1650_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"

config/coreboot/t400_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t400_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t400_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t420_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/t420s_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/t430_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/t440plibremrc_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"

config/coreboot/t500_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t500_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t500_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t520_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/t530_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/t60_16mb_intelgpu/target.cfg

@@ -1,5 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 grub_scan_disk="ahci"

config/coreboot/t60_intelgpu/target.cfg

@@ -1,5 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 grub_scan_disk="ahci"

config/coreboot/w500_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/w500_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/w500_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/w530_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/w541_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"

config/coreboot/x200_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/x200_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/x200_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/x220_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"

config/coreboot/x230_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/x230_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/x230t_12mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/x230t_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"

config/coreboot/x301_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"

config/coreboot/x301_4mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"

config/coreboot/x301_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"

config/coreboot/x60/target.cfg

@@ -1,5 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 grub_scan_disk="ahci"

config/coreboot/x60_16mb/target.cfg

@@ -1,5 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_seabios_withgrub="y"
+payload_grub="y"
 grub_scan_disk="ahci"