coreboot: only run GRUB as a secondary payload

See:
https://codeberg.org/libreboot/lbmk/issues/216

Almost all users will be OK running GRUB, but a
minority of users have experienced a fatal error
pertaining to grub_free() or grub_realloc() (as
my investigation of GRUB sources reveal when grepping
the error reported in the link above).

We don't yet know what the bug is, only that the
error occurs, leading to an effective brick if the
user has GRUB as their primary payload.

So far, it has only been reported on some Intel
SandyBridge-based Dell Latitudes in Libreboot, but
we can't be too sure.

The user reported that memtest86+ passes just fine,
and SeaBIOS works; BIOS GRUB also works, which means
that the bug is likely only in an area of GRUB that
runs specifically on the coreboot payload, so it's
probably a driver in GRUB when running on the metal
rather than BIOS/UEFI.

The build system supports a configuration whereby
SeaBIOS is the primary payload, but GRUB is available
in the SeaBIOS boot select menu, and an additional
configuration is available where GRUB is what SeaBIOS
executes first (while still providing boot select);
both of these are now the *only* configurations
available, on all x86 targets except QEMU.

The QEMU target is fine because if the bug occurs there,
you can just close QEMU and try a different image.

Even after this bug is later identified and fixed,
the GRUB source code is vastly over-engineered and there
are likely many more such bugs. SeaBIOS is a reliable
payload; the code is small and robust. Remember always:

Code

equals

bugs

Therefore, this configuration change is likely going
to be permanent. This will apply in the next release.

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

config/coreboot/haswell/target.cfg

@@ -1,3 +1,2 @@
 tree="haswell"
 rev="b7341da19133991efd29880849bdaab29a6e243d"
-xarch="i386-elf"

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

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

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

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"

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

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

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

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

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

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"

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

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"