make GRUB multi-tree and re-add xhci patches

Re-add xHCI only on haswell and broadwell machines, where
they are needed. Otherwise, keep the same GRUB code.

The xHCI patches were removed because they caused issues
on Sandybridge-based Dell Latitude laptops. See:
https://codeberg.org/libreboot/lbmk/issues/216

The issue was not reported elsewhere, including on the
Haswell/Broadwell hardware where they are needed, but the
build system could only build one version of GRUB.

The older machines do not need xHCI patches, because they
either do not have xHCI patches, or work (in GRUB) because
they're in EHCI mode when running the payload.

So, the problem is that we need the xHCI patches for GRUB
on Haswell/Broadwell hardware, but the patches break
Sandybridge hardware, and we only had the one build of GRUB.
To mitigate this problem, the build system now supports
building multiple revisions of GRUB, with different patches,
and each given coreboot target can say which GRUB tree to use
by setting this in target.cfg:

grubtree="xhci"

In the above example, the "xhci" tree would be used. Some
generic GRUB config has been moved to config/data/grub/
and config/grub/ now looks like config/coreboot/ - also,
the grub.cfg file (named "payload" in each tree) is copied
to the GRUB source tree as ".config", then added to GRUB's
memdisk in the same way, as grub.cfg.

Several other design changes had to be made because of this:

* grub.cfg in memdisk no longer automatically jumps to one
  in CBFS, but now shows a menuentry for it if available

* Certain commands in script/trees are disabled for GRUB,
  such as *config make commands.

* gnulib is now defined in config/submodule/grub/, instead
  of config/git/grub - and this mitigates an existing bug
  where downloading gnulib first would make grub no longer
  possible to download in lbmk.

The coreboot option CONFIG_FINALIZE_USB_ROUTE_XHCI has been
re-enabled on: Dell OptiPlex 9020 MT, Dell OptiPlex 9020 SFF,
Lenovo ThinkPad T440p and Lenovo ThinkPad W541 - now USB should
work again in GRUB.

The GRUB payload has been re-enabled on HP EliteBook 820 G2.

This change will enable per-board GRUB optimisation in the
future. For example, we hardcode what partitions and LVMs
GRUB scans because * is slow on ICH7-based machines, due
to GRUB's design. On other machines, * is reasonably fast,
for automatically enumerating the list of devices for boot.

Use of * (and other wildcards) could enable our GRUB payload
to automatically boot more distros, with minimal fuss. This
can be done at a later date, in subsequent revisions.

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

1 files changed, 11 insertions, 19 deletions

diff --git a/script/roms b/script/roms
index 1e596192..7e5e1be6 100755
--- a/script/roms
+++ b/script/roms
@@ -12,7 +12,6 @@ set -u -e
 
 seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
 grub_background="background1280x800.png"
-grubelf="elf/grub/grub.elf"
 cfgsdir="config/coreboot"
 picosrc="src/pico-serprog"
 picosdk="src/pico-sdk"
@@ -23,7 +22,7 @@ stm32src="src/stm32-vserprog"
 pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t"
 pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub mt86bin"
 v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release"
-v="$v grub_timeout ubdir board grub_scan_disk uboot_config"
+v="$v grub_timeout ubdir board grub_scan_disk uboot_config grubtree grubelf"
 eval "$(setvars "n" $pv serprog)"
 eval "$(setvars "" $v boards _displaymode _payload _keyboard all targets \
     serprog_boards_dir _scandisk)"
@@ -172,6 +171,9 @@ configure_target()
 	[ -z "$_grub_scan_disk" ] && _grub_scan_disk="nvme ahci ata"
 	grub_scan_disk="${_grub_scan_disk# }"
 
+	[ -n "$grubtree" ] || grubtree="default"
+	grubelf="elf/grub/$grubtree/payload/grub.elf"
+
 	[ -z "$tree" ] && $err "$board: tree not defined"
 
 	[ "$payload_memtest" != "y" ] && payload_memtest="n"
@@ -225,24 +227,14 @@ build_payloads()
 
 build_grub_payload()
 {
-	x_ mkdir -p elf/grub
-
-	for keymapfile in config/grub/keymap/*.gkb; do
+	for keymapfile in "$grubdata/keymap/"*.gkb; do
 		[ -f "$keymapfile" ] && keymaps="$keymaps $keymapfile"
 	done
-	[ -z "$_keyboard" ] || [ -f "$grubcfgsdir/keymap/$_keyboard.gkb" ] || \
+	[ -z "$_keyboard" ] || [ -f "$grubdata/keymap/$_keyboard.gkb" ] || \
 		$err "build_grub_payload: $_keyboard layout not defined"
-	[ -n "$_keyboard" ] && keymaps="$grubcfgsdir/keymap/$_keyboard.gkb"
-	[ -f "$grubelf" ] && return 0
-	[ -f "src/grub/grub-mkstandalone" ] || x_ ./update trees -b grub
-
-	./src/grub/grub-mkstandalone --grub-mkimage="src/grub/grub-mkimage" \
-	    -O i386-coreboot -o "elf/grub/grub.elf" -d "src/grub/grub-core/" \
-	    --fonts= --themes= --locales=  --modules="$grub_modules" \
-	    --install-modules="$grub_install_modules" \
-	    "/boot/grub/grub.cfg=$grubcfgsdir/config/grub_memdisk.cfg" \
-	    "/boot/grub/grub_default.cfg=$grubcfgsdir/config/grub.cfg" || \
-	    $err "could not generate grub.elf"
+	[ -n "$_keyboard" ] && keymaps="$grubdata/keymap/$_keyboard.gkb"
+
+	[ -f "$grubelf" ] || x_ ./update trees -b grub $grubtree; return 0
 }
 
 build_uboot_payload()
@@ -343,7 +335,7 @@ build_grub_roms()
 	# we only need insert background.png once, for each coreboot config:
 	if [ "$displaymode" = "vesafb" ] || \
 	    [ "$displaymode" = "corebootfb" ]; then
-		backgroundfile="config/grub/background/$grub_background"
+		backgroundfile="$grubdata/background/$grub_background"
 		"$cbfstool" "$tmprom" add -f "$backgroundfile" -n \
 		    background.png -t raw || $err "!bg, $backgroundfile"
 	fi
@@ -376,7 +368,7 @@ build_grub_roms()
 		if [ "$payload_seabios_withgrub" = "y" ] && \
 		    [ "$payload1" != "grub" ]; then
 			x_ "$cbfstool" "$tmpgrubrom" add \
-			    -f "config/grub/bootorder" -n bootorder -t raw
+			    -f "$grubdata/bootorder" -n bootorder -t raw
 			x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
 			if [ "$payload_seabios_grubonly" = "y" ]; then
 				x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \