From 102ce12cea023783729d6a2cd1576afc95bf7540 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 2 Jan 2024 11:37:25 +0000
Subject: [PATCH] rebase cbmk 9429287 per lbmk c4d90087..f5b04fa5

cbmk 9429287 is the present canoeboot revision, on this day,
two commits after canoeboot 20231107

the cbmk revision was based on lbmk c4d90087, but lbmk
has developed a lot since, right up to f5b04fa5. lbmk
c4d90087 was four commits after libreboot 20231106

this patch brings cbmk up to date, versus lbmk f5b04fa5,
which is 135 commits after libreboot 20231106 (not 4)

therefore, the next canoeboot release shall import lbmk
changes made *after* lbmk revision f5b04fa5. good day!

In English (the above is for my reference, next time
I make a new canoeboot release):

This imports all of the numerous improvements from
Libreboot, sans the non-FSDG-compliant changes. You
can find a full list of such changes in the audit4 page:

https://libreboot.org/news/audit4.html

A full canoeboot-ised changelog will be available in
the next canoeboot release, with these and subsequent
changes. Most notable here is the update to the new
GRUB 2.12 release (instead of 2.12-rc1), and the
improvements Riku made to pico-serprog. And the build
system improvements from lbmk, such as improved, more
generic cmake and autoconf handling.

Canoeboot-specific changes: I also tweaked the deblob
logic, to make it less error-prone. The new design
changes imported into cbmk (based on latest lbmk) somewhat
broke the deblob logic; it was constantly reminding the
user that blobs.list was missing for coreboot,
at config/coreboot/blobs.list - coreboot is a multi-tree
project in both cbmk and lbmk, and the deblob logic was
tuned for single/multi, but was treating coreboot as both.
for simplicity, i removed the check for whether blobs.list
is present. this means that the operator must ensure that
these files are present, in any given revision, where they
are required on a given set of projects (and the files are
all present, in this update to cbmk)

Also of note: the grub.cfg improvements are included in this
cbmk update. The improved grub.cfg can find grub/syslinux
configs by default, not just grub anymore, also finds extlinux,
and will also find them on EFI System Partition - in addition,
UEFI-based install media is also more robust; although cbmk
doesn't provide UEFI configurations on x86, our GRUB palyoad
does still need to work with distro install media, and many
of them now use UEFI-based GRUB configurations in their
installation media, which just happen to work with our GRUB

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 build                                         |  61 ++--
 config/coreboot/d510mo/target.cfg             |   5 +-
 config/coreboot/d510mo_16mb/target.cfg        |   5 +-
 config/coreboot/d945gclf_512kb/target.cfg     |   5 +-
 config/coreboot/d945gclf_8mb/target.cfg       |   5 +-
 config/coreboot/default/target.cfg            |   3 +-
 config/coreboot/dell/target.cfg               |   3 +-
 config/coreboot/e6400_4mb/target.cfg          |   4 +-
 config/coreboot/fam15h_rdimm/target.cfg       |   5 +-
 config/coreboot/fam15h_udimm/target.cfg       |   5 +-
 config/coreboot/g43t-am3/target.cfg           |   5 +-
 config/coreboot/g43t-am3_16mb/target.cfg      |   5 +-
 config/coreboot/ga-g41m-es2l/target.cfg       |   5 +-
 config/coreboot/gru_bob/target.cfg            |   5 +-
 config/coreboot/gru_kevin/target.cfg          |   5 +-
 .../config/libgfxinit_txtmode                 |   7 +-
 config/coreboot/kcma-d8-rdimm_16mb/target.cfg |   6 +-
 .../config/libgfxinit_txtmode                 |   7 +-
 config/coreboot/kcma-d8-rdimm_2mb/target.cfg  |   6 +-
 .../config/libgfxinit_txtmode                 |   7 +-
 config/coreboot/kcma-d8-udimm_16mb/target.cfg |   6 +-
 .../config/libgfxinit_txtmode                 |   7 +-
 config/coreboot/kcma-d8-udimm_2mb/target.cfg  |   6 +-
 config/coreboot/kfsn4-dre_1mb/target.cfg      |   6 +-
 config/coreboot/kfsn4-dre_2mb/target.cfg      |   6 +-
 .../config/libgfxinit_txtmode                 |   8 +-
 .../coreboot/kgpe-d16-rdimm_16mb/target.cfg   |   6 +-
 .../config/libgfxinit_txtmode                 |   8 +-
 config/coreboot/kgpe-d16-rdimm_2mb/target.cfg |   6 +-
 .../config/libgfxinit_txtmode                 |   8 +-
 .../coreboot/kgpe-d16-udimm_16mb/target.cfg   |   6 +-
 .../config/libgfxinit_txtmode                 |   8 +-
 config/coreboot/kgpe-d16-udimm_2mb/target.cfg |   6 +-
 config/coreboot/macbook11/target.cfg          |   5 +-
 config/coreboot/macbook11_16mb/target.cfg     |   5 +-
 config/coreboot/macbook21/target.cfg          |   5 +-
 config/coreboot/macbook21_16mb/target.cfg     |   5 +-
 config/coreboot/qemu_arm64_12mb/target.cfg    |   5 +-
 config/coreboot/qemu_x86_12mb/target.cfg      |   5 +-
 config/coreboot/r400_16mb/target.cfg          |   5 +-
 config/coreboot/r400_4mb/target.cfg           |   5 +-
 config/coreboot/r400_8mb/target.cfg           |   5 +-
 config/coreboot/r500_4mb/target.cfg           |   5 +-
 config/coreboot/t400_16mb/target.cfg          |   5 +-
 config/coreboot/t400_4mb/target.cfg           |   5 +-
 config/coreboot/t400_8mb/target.cfg           |   5 +-
 config/coreboot/t500_16mb/target.cfg          |   5 +-
 config/coreboot/t500_4mb/target.cfg           |   5 +-
 config/coreboot/t500_8mb/target.cfg           |   5 +-
 .../config/libgfxinit_corebootfb              |   2 +-
 .../config/libgfxinit_txtmode                 |   2 +-
 config/coreboot/t60_16mb_intelgpu/target.cfg  |   5 +-
 .../t60_intelgpu/config/libgfxinit_corebootfb |   2 +-
 .../t60_intelgpu/config/libgfxinit_txtmode    |   2 +-
 config/coreboot/t60_intelgpu/target.cfg       |   5 +-
 config/coreboot/w500_16mb/target.cfg          |   5 +-
 config/coreboot/w500_4mb/target.cfg           |   5 +-
 config/coreboot/w500_8mb/target.cfg           |   5 +-
 config/coreboot/x200_16mb/target.cfg          |   5 +-
 config/coreboot/x200_4mb/target.cfg           |   5 +-
 config/coreboot/x200_8mb/target.cfg           |   5 +-
 config/coreboot/x301_16mb/target.cfg          |   5 +-
 config/coreboot/x301_4mb/target.cfg           |   5 +-
 config/coreboot/x301_8mb/target.cfg           |   5 +-
 .../coreboot/x60/config/libgfxinit_corebootfb |   2 +-
 config/coreboot/x60/config/libgfxinit_txtmode |   2 +-
 config/coreboot/x60/target.cfg                |   5 +-
 .../x60_16mb/config/libgfxinit_corebootfb     |   2 +-
 .../x60_16mb/config/libgfxinit_txtmode        |   2 +-
 config/coreboot/x60_16mb/target.cfg           |   5 +-
 config/dependencies/debian                    |   4 +-
 config/dependencies/void                      |  11 +-
 ...-implicit-typecast-fixes-build-error.patch |  38 +++
 config/git/flashrom                           |   2 +-
 config/git/grub                               |   2 +-
 config/git/pico-serprog                       |   2 +-
 config/grub/config/AUTHORS                    |   2 +-
 config/grub/config/grub.cfg                   |  75 ++---
 config/grub/modules.list                      |   3 +
 ...-the-name-libreboot-in-the-grub-menu.patch |   4 +-
 config/grub/target.cfg                        |   3 +
 config/ifd/e6430/gbe                          | Bin 8192 -> 0 bytes
 config/ifd/e6430/ifd                          | Bin 4096 -> 0 bytes
 config/ifd/hp8200sff/gbe                      | Bin 8192 -> 0 bytes
 config/ifd/hp8200sff/ifd                      | Bin 4096 -> 0 bytes
 config/ifd/hp8200sff/ifd_4mb                  | Bin 4096 -> 0 bytes
 config/ifd/hp8300usdt/gbe                     | Bin 8192 -> 0 bytes
 config/ifd/hp8300usdt/ifd                     | Bin 4096 -> 0 bytes
 config/ifd/hp_ivybridge/gbe                   | Bin 8192 -> 0 bytes
 config/ifd/hp_ivybridge/ifd                   | Bin 4096 -> 0 bytes
 config/ifd/hp_sandybridge/gbe                 | Bin 8192 -> 0 bytes
 config/ifd/hp_sandybridge/ifd                 | Bin 4096 -> 0 bytes
 config/ifd/t1650/12_ifd                       | Bin 4096 -> 0 bytes
 config/ifd/t1650/gbe                          | Bin 8192 -> 0 bytes
 config/ifd/t440p/gbe                          | Bin 8192 -> 0 bytes
 config/ifd/t440p/ifd                          | Bin 4096 -> 0 bytes
 config/ifd/xx20/gbe                           | Bin 8192 -> 0 bytes
 config/ifd/xx20/ifd                           | Bin 4096 -> 0 bytes
 config/ifd/xx30/16_ifd                        | Bin 4096 -> 0 bytes
 config/ifd/xx30/gbe                           | Bin 8192 -> 0 bytes
 config/ifd/xx30/ifd                           | Bin 4096 -> 0 bytes
 config/seabios/default/target.cfg             |   1 -
 config/u-boot/default/blobs.list              |   1 +
 config/u-boot/default/target.cfg              |   2 +-
 config/u-boot/gru_bob/target.cfg              |   2 +-
 config/u-boot/gru_kevin/target.cfg            |   2 +-
 config/u-boot/qemu_arm64_12mb/target.cfg      |   2 +-
 config/u-boot/qemu_x86_12mb/target.cfg        |   2 +-
 include/err.sh                                |  30 +-
 include/git.sh                                | 117 +++-----
 include/option.sh                             |  48 +--
 script/build/grub                             |  82 -----
 script/build/roms                             | 281 ++++++++----------
 script/build/serprog                          |  42 ++-
 script/update/release                         |  82 ++---
 script/update/trees                           | 268 ++++++++---------
 util/dell-flash-unlock/README.md              |  23 +-
 117 files changed, 657 insertions(+), 881 deletions(-)
 create mode 100644 config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch
 create mode 100644 config/grub/target.cfg
 delete mode 100644 config/ifd/e6430/gbe
 delete mode 100644 config/ifd/e6430/ifd
 delete mode 100644 config/ifd/hp8200sff/gbe
 delete mode 100644 config/ifd/hp8200sff/ifd
 delete mode 100644 config/ifd/hp8200sff/ifd_4mb
 delete mode 100644 config/ifd/hp8300usdt/gbe
 delete mode 100644 config/ifd/hp8300usdt/ifd
 delete mode 100644 config/ifd/hp_ivybridge/gbe
 delete mode 100644 config/ifd/hp_ivybridge/ifd
 delete mode 100644 config/ifd/hp_sandybridge/gbe
 delete mode 100644 config/ifd/hp_sandybridge/ifd
 delete mode 100644 config/ifd/t1650/12_ifd
 delete mode 100644 config/ifd/t1650/gbe
 delete mode 100644 config/ifd/t440p/gbe
 delete mode 100644 config/ifd/t440p/ifd
 delete mode 100644 config/ifd/xx20/gbe
 delete mode 100644 config/ifd/xx20/ifd
 delete mode 100644 config/ifd/xx30/16_ifd
 delete mode 100644 config/ifd/xx30/gbe
 delete mode 100644 config/ifd/xx30/ifd
 delete mode 100755 script/build/grub

diff --git a/build b/build
index 647b8d6..8341cd5 100755
--- a/build
+++ b/build
@@ -5,7 +5,6 @@
 # SPDX-FileCopyrightText: 2015, 2016 Klemens Nanni <contact@autoboot.org>
 # SPDX-FileCopyrightText: 2022, Caleb La Grange <thonkpeasant@protonmail.com>
 
-[ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
 export LC_COLLATE=C
@@ -19,12 +18,7 @@ eval "$(setvars "" option aur_notice tmpdir)"
 tmpdir_was_set="y"
 set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
 if [ "${tmpdir_was_set}" = "y" ]; then
-	tmpdir="${TMPDIR##*/}"
-	tmpdir="${TMPDIR%_*}"
-	if [ "${tmpdir}" = "cbmk" ]; then
-		tmpdir=""
-		tmpdir_was_set="n"
-	fi
+	[ "${TMPDIR%_*}" = "/tmp/cbmk" ] || tmpdir_was_set="n"
 fi
 if [ "${tmpdir_was_set}" = "n" ]; then
 	export TMPDIR="/tmp"
@@ -32,8 +26,8 @@ if [ "${tmpdir_was_set}" = "n" ]; then
 	export TMPDIR="${tmpdir}"
 else
 	export TMPDIR="${TMPDIR}"
+	tmpdir="${TMPDIR}"
 fi
-tmpdir="${TMPDIR}"
 
 linkpath="${0}"
 linkname="${linkpath##*/}"
@@ -43,27 +37,30 @@ main()
 {
 	xx_ id -u 1>/dev/null 2>/dev/null
 	[ $# -lt 1 ] && fail "Too few arguments. Try: ${0} help"
-	[ "${1}" = "dependencies" ] && xx_ install_packages $@ && cbmk_exit 0
 
-	initialise_command $@ && shift 1
+	[ "$1" = "dependencies" ] && xx_ install_packages $@ && cbmk_exit 0
 
-	check_git
-	check_project "fail"
-	git_init
-
-	execute_command $@
+	for cmd in initcmd check_git check_project git_init excmd; do
+		eval "${cmd} \$@"
+	done
 	cbmk_exit 0
 }
 
-initialise_command()
+initcmd()
 {
 	[ "$(id -u)" != "0" ] || fail "this command as root is not permitted"
 
+	check_project
+
 	case "${1}" in
-	help) usage ${0} && cbmk_exit 0 ;;
-	list) items "${buildpath}" && cbmk_exit 0 ;;
+	help) usage ${0} ;;
+	list) items "${buildpath}" ;;
+	version) mkversion ;;
+	*)
+		option="${1}"
+		return 0 ;;
 	esac
-	option="${1}"
+	cbmk_exit 0
 }
 
 install_packages()
@@ -81,7 +78,7 @@ install_packages()
 
 	xx_ ${pkg_add} ${pkglist}
 	[ -z "${aur_notice}" ] && return 0
-	printf "You must install AUR packages: %s\n" "${aur_notice}" 1>&2
+	printf "You must install AUR packages: %s\n" "$aur_notice" 1>&2
 }
 
 # release archives contain .gitignore, but not .git.
@@ -94,41 +91,53 @@ git_init()
 
 	git init || fail "${PWD}: cannot initialise Git repository"
 	git add -A . || fail "${PWD}: cannot add files to Git repository"
-	git commit -m "${projectname} ${version}" --date "${cdate}" || \
-	    fail "${PWD}: can't commit ${projectname}/${version}, date ${cdate}"
+	git commit -m "${projectname} ${version}" --date "${cdate}" \
+	    --author="cbmk <cbmk@canoeboot.org>" || \
+	    fail "$PWD: can't commit ${projectname}/${version}, date $cdate"
 	git tag -a "${version}" -m "${projectname} ${version}" || \
 	    fail "${PWD}: cannot git-tag ${projectname}/${version}"
 }
 
-execute_command()
+excmd()
 {
 	cbmkcmd="${buildpath}/${option}"
 	[ -f "${cbmkcmd}" ] || fail "Invalid command. Run: ${linkpath} help"
-	"${cbmkcmd}" $@ || fail "execute_command: ${cbmkcmd} ${@}"
+	shift 1; "$cbmkcmd" $@ || fail "excmd: ${cbmkcmd} ${@}"
 }
 
 usage()
 {
 	progname=${0}
 	cat <<- EOF
+	$(mkversion)
+
 	USAGE:	${progname} <OPTION>
 
 	possible values for 'OPTION':
 	$(items "${buildpath}")
 
+	To know what ${projectname} version you're on, type:
+	${progname} version
+
 	Refer to ${projectname} documentation for more info.
 	EOF
 }
 
+mkversion()
+{
+	printf "revision: %s %s\n" "$projectname" "$version"
+	printf "revision date: %s\n" "$(date -Rud @${versiondate})"
+}
+
 cbmk_exit()
 {
-	tmp_cleanup || err "cbmk_exit: can't rm tmpdir upon exit $1: ${tmpdir}"
+	tmp_cleanup || err "cbmk_exit: can't rm tmpdir upon exit $1: $tmpdir"
 	exit $1
 }
 
 fail()
 {
-	tmp_cleanup || printf "WARNING: can't rm tmpdir: %s\n" "${tmpdir}" 1>&2
+	tmp_cleanup || printf "WARNING: can't rm tmpdir: %s\n" "$tmpdir" 1>&2
 	err "${1}"
 }
 
diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg
index b127411..69c1db4 100644
--- a/config/coreboot/d510mo/target.cfg
+++ b/config/coreboot/d510mo/target.cfg
@@ -1,9 +1,6 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
 payload_memtest="y"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/d510mo_16mb/target.cfg b/config/coreboot/d510mo_16mb/target.cfg
index 1bfff85..1e7b56c 100644
--- a/config/coreboot/d510mo_16mb/target.cfg
+++ b/config/coreboot/d510mo_16mb/target.cfg
@@ -1,8 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/d945gclf_512kb/target.cfg b/config/coreboot/d945gclf_512kb/target.cfg
index 4b9708e..cfae0b2 100644
--- a/config/coreboot/d945gclf_512kb/target.cfg
+++ b/config/coreboot/d945gclf_512kb/target.cfg
@@ -1,9 +1,6 @@
 tree="default"
-romtype="normal"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
 payload_memtest="n"
-vendorfiles="n"
-microcode_required="n"
diff --git a/config/coreboot/d945gclf_8mb/target.cfg b/config/coreboot/d945gclf_8mb/target.cfg
index 4b9708e..cfae0b2 100644
--- a/config/coreboot/d945gclf_8mb/target.cfg
+++ b/config/coreboot/d945gclf_8mb/target.cfg
@@ -1,9 +1,6 @@
 tree="default"
-romtype="normal"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
 payload_memtest="n"
-vendorfiles="n"
-microcode_required="n"
diff --git a/config/coreboot/default/target.cfg b/config/coreboot/default/target.cfg
index 076e755..231397b 100644
--- a/config/coreboot/default/target.cfg
+++ b/config/coreboot/default/target.cfg
@@ -1,4 +1,3 @@
 tree="default"
-romtype="normal"
 rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
-arch="x86_64"
+xarch="i386-elf"
diff --git a/config/coreboot/dell/target.cfg b/config/coreboot/dell/target.cfg
index 678e48c..d8ec61d 100644
--- a/config/coreboot/dell/target.cfg
+++ b/config/coreboot/dell/target.cfg
@@ -1,4 +1,3 @@
 tree="dell"
-romtype="normal"
 rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
-arch="x86_64"
+xarch="i386-elf"
diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg
index eea2b6f..3a458ee 100644
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/coreboot/e6400_4mb/target.cfg
@@ -1,6 +1,5 @@
 tree="dell"
-romtype="4MiB ICH9 IFD NOR flash"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
@@ -8,4 +7,3 @@ payload_memtest="y"
 payload_seabios_withgrub="y"
 payload_seabios_grubonly="y"
 grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/config/coreboot/fam15h_rdimm/target.cfg b/config/coreboot/fam15h_rdimm/target.cfg
index 3d5a4dc..7d60e76 100644
--- a/config/coreboot/fam15h_rdimm/target.cfg
+++ b/config/coreboot/fam15h_rdimm/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_rdimm"
-romtype="normal"
 rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="n"
 payload_memtest="n"
-crossgcc_ada="n"
+xlang="c"
diff --git a/config/coreboot/fam15h_udimm/target.cfg b/config/coreboot/fam15h_udimm/target.cfg
index d987c57..6b2d493 100644
--- a/config/coreboot/fam15h_udimm/target.cfg
+++ b/config/coreboot/fam15h_udimm/target.cfg
@@ -1,9 +1,8 @@
 tree="fam15h_udimm"
-romtype="normal"
 rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="n"
 payload_memtest="n"
-crossgcc_ada="n"
+xlang="c"
diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg
index ac38a6c..13f2a26 100644
--- a/config/coreboot/g43t-am3/target.cfg
+++ b/config/coreboot/g43t-am3/target.cfg
@@ -1,8 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-microcode_required="n"
-vendorfiles="n"
 grub_timeout=10
diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg
index ac38a6c..13f2a26 100644
--- a/config/coreboot/g43t-am3_16mb/target.cfg
+++ b/config/coreboot/g43t-am3_16mb/target.cfg
@@ -1,8 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-microcode_required="n"
-vendorfiles="n"
 grub_timeout=10
diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg
index 047fced..ef85da4 100644
--- a/config/coreboot/ga-g41m-es2l/target.cfg
+++ b/config/coreboot/ga-g41m-es2l/target.cfg
@@ -1,9 +1,6 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ata"
-microcode_required="n"
-vendorfiles="n"
 grub_timeout=10
diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg
index 928029c..a7c3615 100644
--- a/config/coreboot/gru_bob/target.cfg
+++ b/config/coreboot/gru_bob/target.cfg
@@ -1,6 +1,3 @@
 tree="default"
-romtype="normal"
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
 payload_uboot="y"
-vendorfiles="n"
-microcode_required="n"
diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg
index 928029c..a7c3615 100644
--- a/config/coreboot/gru_kevin/target.cfg
+++ b/config/coreboot/gru_kevin/target.cfg
@@ -1,6 +1,3 @@
 tree="default"
-romtype="normal"
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
 payload_uboot="y"
-vendorfiles="n"
-microcode_required="n"
diff --git a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
index 6925ff0..63965c2 100644
--- a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
@@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -432,6 +434,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
index dd6fac7..d5d3729 100644
--- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
+++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
index c41f737..f3c3ad5 100644
--- a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
@@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -432,6 +434,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
index dd6fac7..d5d3729 100644
--- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
+++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
diff --git a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
index 6925ff0..63965c2 100644
--- a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
@@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -432,6 +434,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg
index 6e4887a..a8a4a5f 100644
--- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg
+++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
diff --git a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
index c41f737..f3c3ad5 100644
--- a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
@@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -432,6 +434,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg
index 6e4887a..a8a4a5f 100644
--- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg
+++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg
index 5530255..19c57b8 100644
--- a/config/coreboot/kfsn4-dre_1mb/target.cfg
+++ b/config/coreboot/kfsn4-dre_1mb/target.cfg
@@ -1,8 +1,6 @@
 tree="fam15h_udimm"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
 grub_timeout=10
diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg
index 95ec494..9bd20d4 100644
--- a/config/coreboot/kfsn4-dre_2mb/target.cfg
+++ b/config/coreboot/kfsn4-dre_2mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_udimm"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
 grub_timeout=10
diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
index aadeaa2..b83f9ae 100644
--- a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
@@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
-CONFIG_VGA_BIOS_ID="1a03,2000"
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -436,6 +437,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
index 3263842..2867a73 100644
--- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
+++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
 grub_timeout=10
diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
index 7e2a6d9..b7b77e6 100644
--- a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
@@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
-CONFIG_VGA_BIOS_ID="1a03,2000"
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -436,6 +437,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
index 3263842..2867a73 100644
--- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
+++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
 grub_timeout=10
diff --git a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
index aadeaa2..b83f9ae 100644
--- a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
@@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
-CONFIG_VGA_BIOS_ID="1a03,2000"
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -436,6 +437,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg
index a833cda..9bd20d4 100644
--- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg
+++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
 grub_timeout=10
diff --git a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
index 7e2a6d9..b7b77e6 100644
--- a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
+++ b/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
@@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_IRQ_SLOT_COUNT=13
-CONFIG_VGA_BIOS_ID="1a03,2000"
+CONFIG_VGA_BIOS_ID="1000,0072"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=256
-# CONFIG_VGA_BIOS is not set
+CONFIG_VGA_BIOS=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_VGA_BIOS_FILE="/dev/null"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -436,6 +437,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_VGA_BIOS_DGPU=y
+CONFIG_VGA_BIOS_DGPU_FILE="/dev/null"
+CONFIG_VGA_BIOS_DGPU_ID="1000,3050"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg
index a833cda..9bd20d4 100644
--- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg
+++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg
@@ -1,9 +1,7 @@
 tree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
+xarch="i386-elf"
 payload_seabios="y"
 payload_seabios_withgrub="y"
 payload_memtest="y"
-crossgcc_ada="n"
-vendorfiles="n"
+xlang="c"
 grub_timeout=10
diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg
index 117e160..cc83f2c 100644
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/coreboot/macbook11/target.cfg
@@ -1,9 +1,6 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg
index 117e160..cc83f2c 100644
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/coreboot/macbook11_16mb/target.cfg
@@ -1,9 +1,6 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg
index 135e894..8688df3 100644
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/coreboot/macbook21/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg
index 135e894..8688df3 100644
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/coreboot/macbook21_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/coreboot/qemu_arm64_12mb/target.cfg
index 928029c..a7c3615 100644
--- a/config/coreboot/qemu_arm64_12mb/target.cfg
+++ b/config/coreboot/qemu_arm64_12mb/target.cfg
@@ -1,6 +1,3 @@
 tree="default"
-romtype="normal"
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
 payload_uboot="y"
-vendorfiles="n"
-microcode_required="n"
diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg
index d46f30b..4d03eb4 100644
--- a/config/coreboot/qemu_x86_12mb/target.cfg
+++ b/config/coreboot/qemu_x86_12mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="both"
-vendorfiles="n"
-microcode_required="n"
diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/coreboot/r400_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/coreboot/r400_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/coreboot/r400_8mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/coreboot/r500_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/coreboot/t400_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/coreboot/t400_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/coreboot/t400_8mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/coreboot/t500_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/coreboot/t500_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/coreboot/t500_8mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
index 34f8eca..d081da7 100644
--- a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
+++ b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
@@ -253,7 +253,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
index e9c0832..3fb4ff6 100644
--- a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
+++ b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
@@ -253,7 +253,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg
index 8f4eb55..5316aa6 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
 grub_background="background1024x768.png"
diff --git a/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
index 7d6fd65..4a8e1cb 100644
--- a/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
+++ b/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
@@ -253,7 +253,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode
index df837b6..dca8d67 100644
--- a/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode
+++ b/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode
@@ -253,7 +253,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg
index 8f4eb55..5316aa6 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
 grub_background="background1024x768.png"
diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/coreboot/w500_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/coreboot/w500_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/coreboot/w500_8mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/coreboot/x200_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/coreboot/x200_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/coreboot/x200_8mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/coreboot/x301_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/coreboot/x301_4mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg
index 58ae873..8688df3 100644
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/coreboot/x301_8mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
diff --git a/config/coreboot/x60/config/libgfxinit_corebootfb b/config/coreboot/x60/config/libgfxinit_corebootfb
index 6f73570..dedd385 100644
--- a/config/coreboot/x60/config/libgfxinit_corebootfb
+++ b/config/coreboot/x60/config/libgfxinit_corebootfb
@@ -254,7 +254,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/x60/config/libgfxinit_txtmode b/config/coreboot/x60/config/libgfxinit_txtmode
index 9e37259..4f02252 100644
--- a/config/coreboot/x60/config/libgfxinit_txtmode
+++ b/config/coreboot/x60/config/libgfxinit_txtmode
@@ -254,7 +254,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg
index 8f4eb55..5316aa6 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
 grub_background="background1024x768.png"
diff --git a/config/coreboot/x60_16mb/config/libgfxinit_corebootfb b/config/coreboot/x60_16mb/config/libgfxinit_corebootfb
index 0b222ea..419604e 100644
--- a/config/coreboot/x60_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x60_16mb/config/libgfxinit_corebootfb
@@ -254,7 +254,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/x60_16mb/config/libgfxinit_txtmode b/config/coreboot/x60_16mb/config/libgfxinit_txtmode
index 9ec18fe..413a97a 100644
--- a/config/coreboot/x60_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x60_16mb/config/libgfxinit_txtmode
@@ -254,7 +254,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
+CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
 
diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg
index 8f4eb55..5316aa6 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@@ -1,10 +1,7 @@
 tree="default"
-romtype="i945 laptop"
-arch="x86_32"
+xarch="i386-elf"
 payload_grub="y"
 payload_grub_withseabios="y"
 payload_seabios="y"
 grub_scan_disk="ahci"
-microcode_required="n"
-vendorfiles="n"
 grub_background="background1024x768.png"
diff --git a/config/dependencies/debian b/config/dependencies/debian
index e49dc78..f40d9b0 100755
--- a/config/dependencies/debian
+++ b/config/dependencies/debian
@@ -4,12 +4,12 @@ acpica-tools autoconf autogen automake autopoint autotools-dev bc \
 binutils-arm-none-eabi bison build-essential cmake curl device-tree-compiler \
 doxygen e2fsprogs efitools flex fonts-unifont gawk gcc-arm-linux-gnueabi \
 gcc-arm-none-eabi gdb gettext git gnat help2man innoextract libdevmapper-dev \
-libfdt-dev libfont-freetype-perl libfreetype6-dev libftdi-dev libfuse-dev \
+libfdt-dev libfont-freetype-perl libfreetype-dev libftdi-dev libfuse-dev \
 libgnutls28-dev liblz4-tool liblzma-dev libncurses5-dev libncurses-dev \
 libnewlib-arm-none-eabi libopts25 libopts25-dev libpci-dev libpython3-dev \
 libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0 libusb-1.0-0-dev \
 libusb-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted pciutils \
 perl pkg-config python3 python3-distutils python3-pkg-resources python3-pycryptodome \
 python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \
-unifont unzip uuid-dev wget zlib1g-dev \
+unifont unifont-bin unzip uuid-dev wget xfonts-unifont zlib1g-dev \
 "
diff --git a/config/dependencies/void b/config/dependencies/void
index 4d8d544..0ab258c 100644
--- a/config/dependencies/void
+++ b/config/dependencies/void
@@ -3,9 +3,10 @@ pkglist=" \
 acpica-utils autogen base-devel bison cmake \
 cross-arm-none-eabi-binutils cross-arm-none-eabi-gcc \
 cross-arm-none-eabi-libstdc++ cross-arm-none-eabi-newlib curl \
-dejavu-fonts-ttf device-mapper doxygen e2fsprogs flexflex font-unifont-bdf \
-freetype fuse gawk gcc-ada gdb gettext gettext-devel git help2man \
-innoextract libftdi1 libpciaccess libusb nasm ncurses ncurses-devel openssl
-p7zip parted pciutils perl perl-LWP python python3 python3-setuptools rsync \
-sharutils subversion texinfo unar unzip wget xz zlib \
+dejavu-fonts-ttf device-mapper doxygen e2fsprogs flex font-unifont-bdf \
+freetype freetype-devel fuse gawk gcc-ada gdb gettext gettext-devel git \
+help2man innoextract libftdi1 libpciaccess libusb nasm ncurses \
+ncurses-devel openssl openssl-devel p7zip parted pciutils perl perl-LWP \
+python python3 python3-setuptools rsync sharutils subversion texinfo \
+unar unzip wget xz zlib
 "
diff --git a/config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch b/config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch
new file mode 100644
index 0000000..f8cf4be
--- /dev/null
+++ b/config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch
@@ -0,0 +1,38 @@
+From 2d3124cf3c6c2e2de351fcafc572b19565b1d2a5 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Sun, 24 Dec 2023 08:52:55 +0000
+Subject: [PATCH 1/1] fix implicit typecast (fixes build error)
+
+typecasting an enum as (unsigned) should be safe
+
+Change-Id: Ib9d00d39020fef255eb4276bcc7d85c9973caed1
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ libflashrom.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libflashrom.c b/libflashrom.c
+index 0dec22ee..fb7d22a8 100644
+--- a/libflashrom.c
++++ b/libflashrom.c
+@@ -188,7 +188,7 @@ struct flashrom_board_info *flashrom_supported_boards(void)
+ 		for (; i < boards_known_size; ++i) {
+ 			supported_boards[i].vendor = binfo[i].vendor;
+ 			supported_boards[i].name = binfo[i].name;
+-			supported_boards[i].working = binfo[i].working;
++			supported_boards[i].working = (unsigned) binfo[i].working;
+ 		}
+ 	} else {
+ 		msg_gerr("Memory allocation error!\n");
+@@ -226,7 +226,7 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void)
+ 			supported_chipsets[i].chipset = chipset[i].device_name;
+ 			supported_chipsets[i].vendor_id = chipset[i].vendor_id;
+ 			supported_chipsets[i].chipset_id = chipset[i].device_id;
+-			supported_chipsets[i].status = chipset[i].status;
++			supported_chipsets[i].status = (unsigned) chipset[i].status;
+ 	  }
+ 	} else {
+ 		msg_gerr("Memory allocation error!\n");
+-- 
+2.39.2
+
diff --git a/config/git/flashrom b/config/git/flashrom
index 64586ed..2b6fb57 100644
--- a/config/git/flashrom
+++ b/config/git/flashrom
@@ -1,5 +1,5 @@
 {flashrom}{
-	rev: fba29da188b4a3aa8a3cf6f5a3d13c37a5d9e1d7
+	rev: 05c629be2964bcee368c03d805747da15281856d
 	loc: flashrom 
 	url: https://review.coreboot.org/flashrom.git
 	bkup_url: https://github.com/flashrom/flashrom
diff --git a/config/git/grub b/config/git/grub
index c34c27b..3abec3e 100644
--- a/config/git/grub
+++ b/config/git/grub
@@ -1,5 +1,5 @@
 {grub}{
-	rev: e58b870ff926415e23fc386af41ff81b2f588763
+	rev: b835601c7639ed1890f2d3db91900a8506011a8e
 	loc: grub
 	url: git://git.savannah.gnu.org/grub.git
 	bkup_url: https://codeberg.org/libreboot/grub
diff --git a/config/git/pico-serprog b/config/git/pico-serprog
index 16acbbe..60b72c7 100644
--- a/config/git/pico-serprog
+++ b/config/git/pico-serprog
@@ -1,5 +1,5 @@
 {pico-serprog}{
-	rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9
+	rev: 0d49d6fcbe33a5af1bff599be6ff84ddda0bc3fe
 	loc: pico-serprog
 	url: https://codeberg.org/libreboot/pico-serprog
 	bkup_url: https://git.disroot.org/libreboot/pico-serprog
diff --git a/config/grub/config/AUTHORS b/config/grub/config/AUTHORS
index 542739c..8b329e3 100644
--- a/config/grub/config/AUTHORS
+++ b/config/grub/config/AUTHORS
@@ -1,2 +1,2 @@
-Copyright (C) 2014, 2015, 2016, 2020, 2021, 2023 Leah Rowe <leah@libreboot.org>
+Copyright (C) 2014-2016,2020,2021,2023 Leah Rowe <leah@libreboot.org>
 Copyright (C) 2015 Klemens Nanni <contact@autoboot.org>
diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg
index 8a12406..a815188 100644
--- a/config/grub/config/grub.cfg
+++ b/config/grub/config/grub.cfg
@@ -46,8 +46,10 @@ fi
 
 function try_user_config {
 	set root="${1}"
-	for dir in boot grub grub2 boot/grub boot/grub2; do
-		for name in '' osboot_ autoboot_ libreboot_ coreboot_; do
+
+	# The @/... entries are for cases where the BTRFS filesystem is being used
+	for dir in boot grub grub2 boot/grub boot/grub2 @/boot @/grub @/grub2 @/boot/grub @/boot/grub2; do
+		for name in '' libreboot_ osboot_ autoboot_ coreboot_ gnuboot_ canoeboot_; do
 			if [ -f /"${dir}"/"${name}"grub.cfg ]; then
 				unset superusers
 				configfile /"${dir}"/"${name}"grub.cfg
@@ -69,16 +71,20 @@ function search_grub {
 
 function try_isolinux_config {
 	set root="${1}"
-	for dir in '' /boot; do
+	for dir in '' /boot /EFI /boot/EFI /@ /@/boot /@/boot/EFI /@/EFI; do
 		if [ -f "${dir}"/isolinux/isolinux.cfg ]; then
 			syslinux_configfile -i "${dir}"/isolinux/isolinux.cfg
 		elif [ -f "${dir}"/syslinux/syslinux.cfg ]; then
 			syslinux_configfile -s "${dir}"/syslinux/syslinux.cfg
+		elif [ -f "${dir}"/syslinux/extlinux.conf ]; then
+			syslinux_configfile -s "${dir}"/syslinux/extlinux.conf
+		elif [ -f "${dir}"/extlinux/extlinux.conf ]; then
+			syslinux_configfile -s "${dir}"/extlinux/extlinux.conf
 		fi
 	done
 }
 function search_isolinux {
-	echo "\nAttempting to parse isolinux/syslinux config from '${1}' devices"
+	echo "\nAttempting to parse iso/sys/extlinux config from '${1}' devices"
 	for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
 		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
 			try_isolinux_config "(${1}${i},${part})"
@@ -88,13 +94,21 @@ function search_isolinux {
 	done
 	echo # Insert newline
 }
+function try_bootcfg {
+	try_user_config "${1}"
+	try_isolinux_config "${1}"
+}
+function search_bootcfg {
+	search_grub "${1}"
+	search_isolinux "${1}"
+}
 menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o' {
 
 	if [ "${grub_scan_disk}" != "ata" ]; then
-		search_grub ahci
+		search_bootcfg ahci
 	fi
 	if [ "${grub_scan_disk}" != "ahci" ]; then
-		search_grub ata
+		search_bootcfg ata
 	fi
 
 	# grub device enumeration is very slow, so checks are hardcoded
@@ -109,7 +123,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 	# TODO: optimize grub itself, and use */? here for everything
 
 	for vol in ${lvmvol} ${raidvol} ; do
-		try_user_config "${vol}"
+		try_bootcfg "${vol}"
 	done
 
 	unset ahcidev
@@ -135,51 +149,26 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 
 	# after cryptomount, lvm volumes might be available
 	for vol in ${lvmvol}; do
-		try_user_config "${vol}"
+		try_bootcfg "${vol}"
 	done
 
-	search_grub crypto
+	search_bootcfg crypto
 
-	if [ "${grub_scan_disk}" != "ata" ]; then
-		# Last resort, if all else fails
-		set root=ahci0,1
-		for p in / /boot/; do
-			if [ -f "${p}vmlinuz" ]; then
-				linux ${p}vmlinuz root=/dev/sda1 rw
-				if [ -f "${p}initrd.img" ]; then
-					initrd ${p}initrd.img
-				fi
-			fi
-		done
-	fi
-
-	if [ "${grub_scan_disk}" != "ahci" ]; then
-		# Last resort (for setups that use IDE instead of SATA)
-		set root=ata0,1
-		for p in / /boot/; do
-			if [ -f "${p}vmlinuz" ]; then
-				linux ${p}vmlinuz root=/dev/sda1 rw
-				if [ -f "${p}initrd.img" ]; then
-					initrd ${p}initrd.img
-				fi
-			fi
-		done
-	fi
+	for vol in lvm/* ; do
+		try_bootcfg "${vol}"
+	done
 
 	true # Prevent pager requiring to accept each line instead of whole screen
 }
 
-menuentry 'Find and load GRUB config from USB drive  [s]' --hotkey='s' {
-	search_grub usb
+menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on USB  [s]' --hotkey='s' {
+	search_bootcfg usb
 }
-menuentry 'Find and load ISOLINUX/EXTLINUX from USB drive  [u]' --hotkey='u' {
-	search_isolinux usb
+menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on AHCI  [a]' --hotkey='a' {
+	search_bootcfg ahci
 }
-menuentry 'Find and load ISOLINUX/EXTLINUX menu via AHCI  [a]' --hotkey='a' {
-	search_isolinux ahci
-}
-menuentry 'Find and load ISOLINUX/EXTLINUX menu via ATA/IDE  [d]' --hotkey='d' {
-	search_isolinux ata
+menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on ATA/IDE  [d]' --hotkey='d' {
+	search_bootcfg ahci
 }
 if [ -f (cbfsdisk)/grubtest.cfg ]; then
 menuentry 'Load test configuration (grubtest.cfg) inside of CBFS  [t]' --hotkey='t' {
diff --git a/config/grub/modules.list b/config/grub/modules.list
index 0557edd..40bfd33 100644
--- a/config/grub/modules.list
+++ b/config/grub/modules.list
@@ -38,8 +38,10 @@ diskfilter \
 echo \
 ehci \
 eval \
+exfat \
 elf \
 ext2 \
+fat \
 f2fs \
 gcry_arcfour \
 gcry_blowfish \
@@ -101,6 +103,7 @@ multiboot \
 multiboot2 \
 nativedisk \
 normal \
+ntfs \
 ohci \
 part_bsd \
 part_dfly \
diff --git a/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch
index f623cdf..68b337d 100644
--- a/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch
@@ -1,7 +1,7 @@
 From 70f9e72c3ff6381fe3519612de3b649c0cf26b9a Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sat, 19 Nov 2022 16:30:24 +0000
-Subject: [PATCH 2/3] say the name libreboot, in the grub menu
+Subject: [PATCH 2/3] say the name canoeboot, in the grub menu
 
 ---
  grub-core/normal/main.c | 2 +-
@@ -16,7 +16,7 @@ index bd4431000..31308e16a 100644
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Canoeboot 20231107 release, based on Libreboot 20231106.    https://canoeboot.org/"));
++  msg_formatted = grub_xasprintf (_("Canoeboot 20240102 release, based on Libreboot 20240102.    https://libreboot.org/"));
    if (!msg_formatted)
      return;
  
diff --git a/config/grub/target.cfg b/config/grub/target.cfg
new file mode 100644
index 0000000..9b34245
--- /dev/null
+++ b/config/grub/target.cfg
@@ -0,0 +1,3 @@
+bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
+autoconfargs="--with-platform=coreboot"
+makeargs="FS_PAYLOAD_MODULES=\"\""
diff --git a/config/ifd/e6430/gbe b/config/ifd/e6430/gbe
deleted file mode 100644
index a256f571493b6c39b27435896fafc6087362dca4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeI#ziI+O5C-sX_Y|+NICD9KK(G~T{Fg)`!a>>)h!$xjoi8C<sI@O)nHLD@(xwUG
zE93$40+U&rz@3E_76;!R>@0J$%kqOenEC4x!7oCQErtfJHWm4d`sHS16X>uNKbJSn
zHZF8g?ICSFgt4*7+q+Eyo&BS=Ztd{23Vro{i(fzl2I+HLNhLR6L|%UOWx46U*!J7F
zv>n_I`~^C=(^%Iy(0Hx!YSG2x_+C%wBAqr+`mVug#8(6tCfMD?`mUij;W#8Pn=As8
z^JgL}5R9@J;G>$)F++h<1rB|e%u#>>6rcbFC_n)UP~aQ_bN2t|U@gp<?EjDJ*4Y0a
c=ftYh1q$=C;6*7w0SZun0u-PC1qv_l2d%xBpa1{>

diff --git a/config/ifd/e6430/ifd b/config/ifd/e6430/ifd
deleted file mode 100644
index fe166bc7c6bc130700b433b2813002f382ab2b50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6$imFVBp{@~sK}toz`%g4LWW^N3Q&lFfde8AVoEdo=VoS*Vqj!o
zV))OGsvg7xVF^YK4rFr%3%lvM00%!K$QR)tf`RGb2{4UJH1IJP9AR)|n9gu}DzbQ;
zGla(kqy~$BNOcFu2c+s5RX-X6qaiRF0;3@?8UmvsFd71*Aut*OqaiRfLg2lDC<Chk
ztHOH&F(@q#rWFby;tGWj@k0s_{vibzAEHj)jfp{2K~zEBoe@HNFo0<psJSvwb7c&m
m=I(-;y9;8D!Y+vTdk3gH9H8!SfVl&v4?@#2RPXDI_I&^edfs~g

diff --git a/config/ifd/hp8200sff/gbe b/config/ifd/hp8200sff/gbe
deleted file mode 100644
index 7e8776f92968d9e5a257298123440f91ec361349..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeH~u}i~16vn^YDTZ3`Bn^}-T?Lo4RIR0jfQy54(4}L+$)$h84W)Az|AdaM&f@0k
zBItkOe!eROp>gSAhx=aOeV61rUhbE0<c-Z`cBm0M_lbMJB69A{Jl1+frI1huKJU*@
za%3{7e%FiBt2l{Nx_D8kmh2Dl+L^^*8hiI@iXXr^6`{CJlERh3R~q(Lwo>{vt9Fi>
zYT~?;;|NV$h*m^9qDHhUszsNgb<wA_KCd;Kv~Y9Vl?p8sqXzaqj$uXdZeZgSUuTKj
zYsiy^84q_89hLa=!X^Rz$CvtA-E{Gs1hyv-=FY=alK=^j011!)36KB@?1I3U{lEOM
nv;W_|YYA%x`~R@s_kXT-7yCYIk^l*i011!)36KB@gh}8BC-`8H

diff --git a/config/ifd/hp8200sff/ifd b/config/ifd/hp8200sff/ifd
deleted file mode 100644
index db10f57f750597f8a2b193bcd474188a0d4034d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6z{0}DBp{@~$iSe=z`%g4LWRMA6DR}*AaM{woZ&w^GlLidBLfq|
ze|}W;3=Gmz3_$ZF7&$nQ%^580rt1a_{6K%g0Mo-0FeaRC=4D`LU^u`qoq=H{ToA~p
zbB6GkfYe~|52@||`G8bCqv}UPU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLx7wRkoRC<
u5LFOWIHVxXz^cHi@ZJDQJ3wfKLI^G20Z~Ve9k}$o;2D^{&&NU3;{pIinngMQ

diff --git a/config/ifd/hp8200sff/ifd_4mb b/config/ifd/hp8200sff/ifd_4mb
deleted file mode 100644
index fef3510722d5a6464b622075dc667c4eee3eaf4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6z{0}DBp{@~$iSe=z`%g4LWRMA6DR}*AaM{woZ&w+GlLidBLfq|
ze|}W;3=Gmz3_$ZF7&$nQ%^580rt1a_{6K%g0Mo-0FeaRC=4D`LU^u`qoq=H{ToA~p
zbB6GkfYe~|52@||`G8bCqv}UPU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLx7wRkoRC<
u5LFOWIHVxXz^cHi@ZJDQJ3wfKLI^G20Z~Ve9k}$o;2D^{&&NU3;{pH&wna7o

diff --git a/config/ifd/hp8300usdt/gbe b/config/ifd/hp8300usdt/gbe
deleted file mode 100644
index e959787fd2b5f6b86ce063fd9ba81b037d265451..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeH~u}Z^G6o&ttC<ZAQiGh-(tI#EFt(Kw?a228L3luu_CFBmp+0hqptU8x&U0sCs
z4P4#aujiJ6&`e$IaQ_oH|K;QlC-)0nawK~g*1r*1yTk}E2&`Si&#miNQfSDL%ZD%L
zIWk>TeyT<NHcA3Xr!z@I&F)gKc`~?vjGTM@h+Du~2~hNsq_CxMod#cPTPgjS<s!$K
zG;rC;ae@Y}RF73Vs<CQUHB^07t*X9l^nIh*q=~zJS35LO3~M;}JcUukM+_6CShW+q
zSJOB3Gsc5S7?k+4uuUMm*{%TdO1Z`g3G7P1&y$C{CIJ#40TLhq5+DH**ardO{I9?3
nod0*7S$y+z{`c*R|KEQ1aqhDx36KB@kN^pg011$Qp9FpZa<ycT

diff --git a/config/ifd/hp8300usdt/ifd b/config/ifd/hp8300usdt/ifd
deleted file mode 100644
index 3b81b7046a120162504ae6bd4a93ed9be0459cd0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6z{0}DBp{@~sK}toz`%g4f|X%H3Q!0PK;j^VG{b+O9w`P!1|}d2
zRXvCY!V-)e9LVMj7IxEh0|tIZh<`vN)58-84wTi*%V5C3aDZhx1H(*Y$vS5Uj|oT(
z7XOgy4v-H>)ibJoGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E2C2?2Re1_n_DQH4Va
l5)7;gtP1ZPAhdiZL|kDPginsyg!H`N8koM%=Rwrt0s#ISP(T0x

diff --git a/config/ifd/hp_ivybridge/gbe b/config/ifd/hp_ivybridge/gbe
deleted file mode 100644
index aa9556f0e3867e7f40cb958c1d615197247f065c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmX>X{!eK2aR!e6|GzNgGcq*%2ZF-__a$rum_!+XfQcPMvM$vyV2}bbc#`-Ww4FJG
z8JR@a?qU*U29h8MQaho6!LJRZm;tN>%=-VIfsx4}UYOkhWG*UTVEq4o=`pY}3<9B&
z$;5y`gvpS>%))?ypTUs997uBkX$v4N0Hm#eG&7K12c#u{^m-`00ZL1?7%}(+SpjV@
zVsJ>1XJEM~$j|_!8O{hWG;oMATs0L2%E>bzY#dpv%-|MgMvU+u6+jOGW?OU-28KO6
zm|~+Mqai?Q2#l-}XVkZ&Aut*OqaiRF0;3@?8UmvsFd6~_83N}<`~Se^`e^^3)IQ5d
rQ$O1OA89d8KmQJ7`9Es+Xb6mkz-S1JhQMeDjE2By2#kin$O-`f?__F<

diff --git a/config/ifd/hp_ivybridge/ifd b/config/ifd/hp_ivybridge/ifd
deleted file mode 100644
index cc11e46659edb57c0632e9d56089099c34348a2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6z{1SNBp{@~sK}toz`%g4LX}~H3Q!0PK;j^VG{b+O9w`P!1}298
z@~G-TJP?*(<lsOyXRxrFt_yJRGlF~(1|k@k9-aWx$V3A#gTWDoNQUVQ3^S3%>zpAx
zCLlFf{6nfcKt3Q<&#3y*5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=Cp%DV|?hFi~3Ze?{
i9mE+}6<8G%c1eKgLkbZ3y#s_E8or^-mG`+u`#u2o#8N>3

diff --git a/config/ifd/hp_sandybridge/gbe b/config/ifd/hp_sandybridge/gbe
deleted file mode 100644
index e0179de2e8a4facc8d16e69c6511a707e19ca2db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeH~KTE?v7{;HwC=F6-Bu1o5aTB_vrD`b(fi4ckLBD{w`7KTe&TdYQj{cd&&DBNF
z&vQOk3eslkVuw6$;C+raPjb0m;JCLO-0z(}Aol(nEd%EnA4zxTII$TRwh{9B<9?1d
z2hFQi(H+OBvDwp`%_8P-(d+IU&Tix2o<0%=@E*n%leAHU_s$25_vU75tE4}t9pu=y
zJsb{mY@&xF>IQX4O{gPkM17|2QeS5JI@5O9$K-s(8Tu$LJ6QYLf}`Ryfr~Tz9HhM0
z;g{Akt}n{SRQRi~NFX{{tN`!LYE2apSe8INcOI=;1VlgtL_h>YKm<f!6$DE4|2(d%
m|6jIesheN@f8GB0|E+fw`@ZHB0TB=Z5fA|p5CIXWCxKs22xO1|

diff --git a/config/ifd/hp_sandybridge/ifd b/config/ifd/hp_sandybridge/ifd
deleted file mode 100644
index 3838bab065a08707708f35e058555e1545a440ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6z{1SNBp{@~sK}toz`%g4LWN<13Q!0PK;j^V1jB!JW(IKvMg}H^
z|MIBnK|BzaVC3LHHfOM~o30CR@H0aE10tCoo<MM*tOi~NgCh)~4AU7HW+F@0F++Gv
zKx(k~hg5ffd_bz6QT3xCFd71*Aut*OqaiRF0;3@?8UmvsFd70wBLw8#85l$rL>1mU
zh%>M%uqqr<fY34q5L(^?DsLbLm50##RlOKE6*z(VAbc4^2t71>jop>^MMnER0Gn4X
A_W%F@

diff --git a/config/ifd/t1650/12_ifd b/config/ifd/t1650/12_ifd
deleted file mode 100644
index 623470e94c106880ebce024687f8c65aa474a1a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6$imFVBp{@~sK}toz`%g4LWW_23Q&lFfde8AVoEdo=VoS*Vqj!o
zV))OGsvg7xVF^YK4rFr%3%lvM00%!K$QR)tf`RGb2{4UJ^l&p69AP-fFrDG{RAliw
zX9$l8NDUVMkm?SQ4@lKBs(v&CMnhmU1V%$(Gz3ONU^E0qLtr!nMnhm|gur_PQ3h58
zR)zNlVo+KfOe+*Z#1#r5;)fI<{6h*bK17|o8xw=5f~bPLJ0pblU;xuHP;+IV=E@jA
n&D{kxcNfGQg<TNw_YP2ZI6&Ru0CNXSAB3i5sNUBZ?fU=#2Q}Wr

diff --git a/config/ifd/t1650/gbe b/config/ifd/t1650/gbe
deleted file mode 100644
index 963369d50911d10d75fe3503349bfda1828b54db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeH~Jxjw-6o%h>V`z|q328vGbS=1~^{WI5QCAVvKj7-%f4D<&cJEv_KW1^#)kUyB
zL~uWzl!DMqUF>k*8#vG9<b<311TH!G(f!-c4I+^*92>Z#5P6Twuov45I&7<s;j~vE
z*GYR9)y_$j8k;@5*euXkUs~(#9L{c|x_bUdJ%I=es`Io}Nn^l>Oupx3jqq1&_X>1u
z9|yw%Tj=9Zxv3l~V`Zrfl#j}7<<o-C3+CeiPA^JbVSwtYi;d3&PKl2gF3K?5PxW3`
z-_*}>eK`(H!#@+t27=LY26$~ZbIj1dss{W#dAMsDpaB}70UDqI8lZu77|7ZG>+d@I
m|5bYy-|E@_`}W2EZ@=p}_qiqw&;Sk401eOp4bXs}27UpJ*<_Fa

diff --git a/config/ifd/t440p/gbe b/config/ifd/t440p/gbe
deleted file mode 100644
index 6640a4f0b661200a868bc93106fae5b31301d765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmd1!u2K83gpuR_|H}-T3=9nn0{{OX7T{A_C2l3k00d0zAd+>dh5>^lkinCp<-q04
zA<Sqcx^|b9D1-#DfLa?E{MtA`s)1S*7JwK$|Nk>EGB}uuvOE0801S-(|3{{Plwksd
z;)Voy1_loS1_vO`a#4`s0Fc(;5C`LU1_=fZ262XX76~}t1IlM$kZ0iDVgPiDAp;AL
zHU`pcKw1_^GyXMT(3@k(;IqwuffdL{*f#Q5nZYg0jF=HHDuNaQ%(iF(K<*wMOtDds
z(GVat1V&z|GwS2f5Eu=C(GVC7fzc2c4S~@R7!84e3W1E#{{LwIpVSV^2vk4X{~v*o
kPA4x9RM|gj?`Q~&hQMeDjE2By2#kinXb6mkz{m>$0E=8}LI3~&

diff --git a/config/ifd/t440p/ifd b/config/ifd/t440p/ifd
deleted file mode 100644
index 241266e632ea9a4eef9fcf4f8a64af0df3338119..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6$imFVBp|B5sK|gS`~SZQ!vs%7r-ZfJcOE$ol4Ae@pek-=1_cI2
z1}298^$Z9MmItZ%|6hWUg9F{H!N6a1T_E8<BLfS_A0WW=@C1Z`MD}nq7&I^(V3^Lp
zFcV3bq0U(X%w>WK!VDP<{vy^5Ag2?nc2wPH2#kinXb6mkz-S1JhQMeDjE2By2#kin
z&<cS=3K9&i3a$!=6vUyl7?@VrCBeX|z^b6IOB_mzf$8@S5)7&estWHN#G$kpn3gGk
bsFNvxs2f_L0CDYoF@k-cFGJB^q_`OXv5h5_

diff --git a/config/ifd/xx20/gbe b/config/ifd/xx20/gbe
deleted file mode 100644
index 0c9dfa1df053c351547cf46596df7cab4c9e8500..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeI#F$%&k6vpw-6lsSJrII@oU3!E<cTeF#-XP9i!m$@{5<G&7lSl9hX#y%_?j-zQ
z;3W^fWcY2-Yr2KEst_IupSm~F$(&a#SEjzcbiLYms1Ms=H&&aK^V8M&BKEXm*3PEA
zrEpeH71p(-ec#S^9kcLn$Wu%RAb<b@2q1s}0tg_000IaguuMSw|Ca%B8vz6mKmY**
Q5I_I{1Q0*~fj<zK0cuDev;Y7A

diff --git a/config/ifd/xx20/ifd b/config/ifd/xx20/ifd
deleted file mode 100644
index d042aba3ce8e7187b29d17e55e89a6348a680f60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6z{1SNBp{@~sK}toz`%g4LWN<1Cr}6sK;j^V1jB!JW(IKvMg}H^
z|NN-xK|BzaVC3LHHfOM~o30CZ@H2vZ5e_04m>!-0)5t^vFN47m21kbJ3=A`o#p{?M
zJSHGDSo}k(J3u}lRnMsU(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fuRushZMvaSQS_m
z-aA0({i@y!yb8Pu@*WHfq6(r43WX5yLvdnIbr4#i5Xv`z$PW$Q;&<hJA*_9$@A!2M
GFIfQJ=Qn-;

diff --git a/config/ifd/xx30/16_ifd b/config/ifd/xx30/16_ifd
deleted file mode 100644
index b3a09fc8cfad736f040a1ae3e0fada00439d2cf9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6$imFVBp{@~sK}tpz`%g4LWW_2Cr}6sK;j^VG{b*>W(Fw+Mg}Gz
z3spUc2f`AJ9305z3>J3Nbpa24Mu>kvB-6ta2o99hz|CNAgu#(vIs?N@WXU>b2#*O!
z4Ho~9>JE?(NYyi{el!F|Ltr!nMnhmU1V%$(Gz3ONU^E0qLttoxz##=O237@Dg+mJB
zP+9^^zjuI$zjuI$zjuI$E9`=ZE9`=ZE9`=Z%M?JwWeOnTG6fLvp%DrYSKgN(*!TG|
Jl>9@ETLG-XBH;i4

diff --git a/config/ifd/xx30/gbe b/config/ifd/xx30/gbe
deleted file mode 100644
index 0c9dfa1df053c351547cf46596df7cab4c9e8500..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeI#F$%&k6vpw-6lsSJrII@oU3!E<cTeF#-XP9i!m$@{5<G&7lSl9hX#y%_?j-zQ
z;3W^fWcY2-Yr2KEst_IupSm~F$(&a#SEjzcbiLYms1Ms=H&&aK^V8M&BKEXm*3PEA
zrEpeH71p(-ec#S^9kcLn$Wu%RAb<b@2q1s}0tg_000IaguuMSw|Ca%B8vz6mKmY**
Q5I_I{1Q0*~fj<zK0cuDev;Y7A

diff --git a/config/ifd/xx30/ifd b/config/ifd/xx30/ifd
deleted file mode 100644
index c377200f9946903037717f0fa9b398def91faf4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmezW9~DF`{lL%6$imFVBp{@~sK}toz`%g4LWW_2Cr}6sK;j^VG{b*xW(Fw+Mg}H^
z|MIBnK|BzaVC3LHHfOM~o30CZ@H0aE10tCoo<MM*tOjldgCh)%4AU7HW+F@0IYW3%
zKx(k~hg5ffd_bz6QT3xCFd71*Aut*OqaiRF0;3@?8UmvsFd70wBLog9h%vA#uqqr<
z5QowdVEVlSMEt!2MEt!2L|kDPL|kDPL|kDPL|mo-A}&(^5tk`|h!2fWfVlF$1i`+~
Lm!aeza@-04>CPhM

diff --git a/config/seabios/default/target.cfg b/config/seabios/default/target.cfg
index 9e116d1..8ab0980 100644
--- a/config/seabios/default/target.cfg
+++ b/config/seabios/default/target.cfg
@@ -1,3 +1,2 @@
-arch="x86_32"
 tree="default"
 rev="1e1da7a963007d03a4e0e9a9e0ff17990bb1608d"
diff --git a/config/u-boot/default/blobs.list b/config/u-boot/default/blobs.list
index bc8639d..0381f52 100644
--- a/config/u-boot/default/blobs.list
+++ b/config/u-boot/default/blobs.list
@@ -17,3 +17,4 @@ arch/x86/dts/microcode/m12306a8_00000010.dtsi
 arch/x86/dts/microcode/m12306a9_0000001b.dtsi
 arch/x86/dts/microcode/m7240651_0000001c.dtsi
 arch/x86/dts/microcode/mc0306d4_00000018.dtsi
+test/lib/strlcat.c
diff --git a/config/u-boot/default/target.cfg b/config/u-boot/default/target.cfg
index 1eda306..fdd0486 100644
--- a/config/u-boot/default/target.cfg
+++ b/config/u-boot/default/target.cfg
@@ -1,3 +1,3 @@
 tree="default"
 rev="4459ed60cb1e0562bc5b40405e2b4b9bbf766d57" # v2023.10
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/gru_bob/target.cfg b/config/u-boot/gru_bob/target.cfg
index 6532f25..1633e9d 100644
--- a/config/u-boot/gru_bob/target.cfg
+++ b/config/u-boot/gru_bob/target.cfg
@@ -1,2 +1,2 @@
 tree="default"
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/gru_kevin/target.cfg b/config/u-boot/gru_kevin/target.cfg
index 6532f25..1633e9d 100644
--- a/config/u-boot/gru_kevin/target.cfg
+++ b/config/u-boot/gru_kevin/target.cfg
@@ -1,2 +1,2 @@
 tree="default"
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/qemu_arm64_12mb/target.cfg b/config/u-boot/qemu_arm64_12mb/target.cfg
index 6532f25..1633e9d 100644
--- a/config/u-boot/qemu_arm64_12mb/target.cfg
+++ b/config/u-boot/qemu_arm64_12mb/target.cfg
@@ -1,2 +1,2 @@
 tree="default"
-arch="AArch64"
+xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/qemu_x86_12mb/target.cfg b/config/u-boot/qemu_x86_12mb/target.cfg
index 24b7cb0..2c300b2 100644
--- a/config/u-boot/qemu_x86_12mb/target.cfg
+++ b/config/u-boot/qemu_x86_12mb/target.cfg
@@ -1,2 +1,2 @@
 tree="default"
-arch="x86_64"
+xarch="i386-elf"
diff --git a/include/err.sh b/include/err.sh
index 33246d1..cab81d0 100755
--- a/include/err.sh
+++ b/include/err.sh
@@ -29,44 +29,38 @@ check_git()
 
 git_err()
 {
-	printf "You need to set git name/email, like so:\n%s\n\n" "${1}" 1>&2
+	printf "You need to set git name/email, like so:\n%s\n\n" "$1" 1>&2
 	fail "Git name/email not configured" || \
 	    err "Git name/email not configured"
 }
 
 check_project()
 {
-	read projectname < projectname || :
+	read -r projectname < projectname || :
 
-	[ ! -f version ] || read version < version || :
+	[ ! -f version ] || read -r version < version || :
 	version_="${version}"
 	[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
 	    version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}"
 
-	[ ! -f versiondate ] || read versiondate < versiondate || :
+	[ ! -f versiondate ] || read -r versiondate < versiondate || :
 	versiondate_="${versiondate}"
 	[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
 	    --pretty='%ct' HEAD)" || versiondate="${versiondate_}"
 
-	[ ! -z ${versiondate} ] || fail "Unknown version date" || \
-	    err "Unknown version date"
-	[ ! -z ${version} ] || fail "Unknown version" || \
-	    err "Unknown version"
-	[ ! -z ${projectname} ] || fail "Unknown project" || \
-	    err "Unknown project"
-
-	xx_ printf "%s\n" "${version}" > version || \
-	    x_ printf "%s\n" "${version}" > version
-	xx_ printf "%s\n" "${versiondate}" > versiondate || \
-	    x_ printf "%s\n" "${versiondate}" > versiondate
+	for p in projectname version versiondate; do
+		eval "[ -n \"\$$p\" ] || fail \"$p unset\" || err \"$p unset\""
+		p_="x_ printf \"%s\\n\" \"\$$p\" > $p"
+		eval "x$p_ || $p_"
+	done
+	export LOCALVERSION="-${projectname}-${version%%-*}"
 }
 
 setvars()
 {
 	_setvars=""
 	[ $# -lt 2 ] && err "setvars: too few arguments"
-	val="${1}"
-	shift 1
+	val="${1}" && shift 1
 	for var in $@; do
 		_setvars="${var}=\"${val}\"; ${_setvars}"
 	done
@@ -78,5 +72,3 @@ err()
 	printf "ERROR %s: %s\n" "${0}" "${1}" 1>&2
 	exit 1
 }
-
-check_project
diff --git a/include/git.sh b/include/git.sh
index 0b171bc..87b8fb0 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -1,18 +1,16 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2020,2021,2023 Leah Rowe <leah@libreboot.org>
+# SPDX-FileCopyrightText: 2020,2021,2023,2024 Leah Rowe <leah@libreboot.org>
 # SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 
 # This file is only used by update/project/trees
 
 eval "$(setvars "" _target rev _xm loc url bkup_url depend)"
-tmp_git_dir="${PWD}/tmp/gitclone"
 
 fetch_project_trees()
 {
 	_target="${target}"
 	[ -d "src/${project}/${project}" ] || fetch_from_upstream
 	fetch_config
-	[ -z "${rev}" ] && err "fetch_project_trees $target: undefined rev"
 	if [ -d "src/${project}/${tree}" ]; then
 		printf "download/%s %s (%s): exists\n" \
 		    "${project}" "${tree}" "${_target}" 1>&2
@@ -36,66 +34,50 @@ fetch_config()
 		eval "$(setvars "" rev tree)"
 		_xm="fetch_config ${project}/${_target}"
 		load_target_config "${_target}"
-		[ "${_target}" != "${tree}" ] && _target="${tree}" && continue
-		break
+		[ "${_target}" = "${tree}" ] && break
+		_target="${tree}"
 	done
 }
 
 load_target_config()
 {
-	[ -f "${cfgsdir}/${1}/target.cfg" ] || \
-		err "${_xm} check: target.cfg does not exist"
+	[ -f "$cfgsdir/$1/target.cfg" ] || err "$1: target.cfg missing"
 	[ -f "${cfgsdir}/${1}/seen" ] && \
 		err "${_xm} check: infinite loop in tree definitions"
 
-	. "${cfgsdir}/${1}/target.cfg" || \
-	    err "load_target_config ${cfgsdir}/${1}: cannot load config"
-
-	touch "${cfgsdir}/${1}/seen" || err "load_config $cfgsdir/$1: !mk seen"
+	. "$cfgsdir/$1/target.cfg" || err "load_target_config !$cfgsdir/$1"
+	touch "$cfgsdir/$1/seen" || err "load_config $cfgsdir/$1: !mk seen"
 }
 
 prepare_new_tree()
 {
-	printf "Creating %s tree %s (%s)\n" "${project}" "${tree}" "${_target}"
+	printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
 
-	x_ cp -R "src/${project}/${project}" "src/${project}/${tree}"
-	git_reset_rev "src/${project}/${tree}" "${rev}"
-	(
-	x_ cd "src/${project}/${tree}"
-	if [ -f ".gitmodules" ]; then
-		git submodule update --init || \
-		    err "prepare_new_tree ${project}/${tree}: !submodules"
-	fi
-	)
-	git_am_patches "$PWD/src/$project/$tree" "$PWD/$cfgsdir/$tree/patches"
+	cp -R "src/${project}/${project}" "${tmpgit}" || \
+	    err "prepare_new_tree ${project}/${tree}: can't make tmpclone"
+	git_prep "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update"
+	nukeblobs "$project/$tree" "$project/$tree"
 }
 
 fetch_project_repo()
 {
 	scan_config "${project}" "config/git" "err"
-	verify_config
+	[ -z "${loc+x}" ] && err "fetch_project_repo $project: loc not set"
+	[ -z "${url+x}" ] && err "fetch_project_repo $project: url not set"
 
 	clone_project
 	[ -z "${depend}" ] || for d in ${depend} ; do
 		x_ ./update trees -f ${d}
 	done
-	rm -Rf "${tmp_git_dir}" || err "fetch_repo: !rm -Rf ${tmp_git_dir}"
-}
+	rm -Rf "${tmpgit}" || err "fetch_repo: !rm -Rf ${tmpgit}"
 
-verify_config()
-{
-	[ -z "${rev+x}" ] && err 'verify_config: rev not set'
-	[ -z "${loc+x}" ] && err 'verify_config: loc not set'
-	[ -z "${url+x}" ] && err 'verify_config: url not set'
-	return 0
+	for x in config/git/*; do
+ 		[ -f "${x}" ] && nukeblobs "${x##*/}" "src/${x##*/}"; continue
+	done
 }
 
 clone_project()
 {
-	rm -Rf "${tmp_git_dir}" || err "clone_project: !rm -Rf ${tmp_git_dir}"
-	mkdir -p "${tmp_git_dir%/*}" || \
-	    err "clone_project: !mkdir -p ${tmp_git_dir%/*}"
-
 	loc="${loc#src/}"
 	loc="src/${loc}"
 	if [ -d "${loc}" ]; then
@@ -103,47 +85,36 @@ clone_project()
 		return 0
 	fi
 
-	git clone ${url} "${tmp_git_dir}" || \
-	    git clone ${bkup_url} "${tmp_git_dir}" || \
-	    err "clone_project: could not download ${project}"
-	git_reset_rev "${tmp_git_dir}" "${rev}"
-	git_am_patches "${tmp_git_dir}" "${PWD}/config/${project}/patches"
-
-	x_ rm -Rf "${loc}"
-	[ "${loc}" = "${loc%/*}" ] || x_ mkdir -p ${loc%/*}
-	mv "${tmp_git_dir}" "${loc}" || \
-	    err "clone_project: !mv ${tmp_git_dir} ${loc}"
+	git clone $url "$tmpgit" || git clone $bkup_url "$tmpgit" \
+	    || err "clone_project: could not download ${project}"
+	git_prep "$PWD/config/$project/patches" "$loc"
 }
 
-git_reset_rev()
+git_prep()
 {
-	(
-	cd "${1}" || err "git_reset_rev: !cd ${1}"
-	git reset --hard ${2} || err "!git reset ${1} <- ${2}"
-	)
+	_patchdir="$1"
+	_loc="$2"
+
+	[ -z "${rev+x}" ] && err "git_prep $_loc: rev not set"
+	git -C "$tmpgit" reset --hard $rev || err "git -C $_loc: !reset $rev"
+	git_am_patches "$tmpgit" "$_patchdir" || err "!am $_loc $_patchdir"
+
+	[ $# -lt 3 ] || [ ! -f "$tmpgit/.gitmodules" ] || \
+	    git -C "$tmpgit" submodule update --init || err "prep $_loc: !mod"
+
+	[ "$_loc" = "${_loc%/*}" ] || x_ mkdir -p "${_loc%/*}"
+	mv "$tmpgit" "$_loc" || err "git_prep: !mv $tmpgit $_loc"
 }
 
 git_am_patches()
 {
-	sdir="${1}" # assumed to be absolute path
-	patchdir="${2}" # ditto
-	(
-	cd "${sdir}" || err "git_am_patches: !cd ${sdir}"
-	for patch in "${patchdir}/"*; do
-		[ -L "${patch}" ] && continue
-		[ -f "${patch}" ] || continue
-		patchfail="n"
-		git am "${patch}" || patchfail="y"
-		if [ "${patchfail}" = "y" ]; then
-			git am --abort || err  "${sdir}: !git am --abort"
-			err  "!git am ${patch} -> ${sdir}"
-		fi
+	for _patch in "$2/"*; do
+		[ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \
+		    "$_patch" || err "git_am $1 $2: !git am $_patch"; continue
 	done
-	)
-	for patches in "${patchdir}/"*; do
-		[ -L "${patches}" ] && continue
-		[ ! -d "${patches}" ] && continue
-		git_am_patches "${sdir}" "${patches}"
+	for _patches in "$2/"*; do
+		[ ! -L "$_patches" ] && [ -d "$_patches" ] && \
+			git_am_patches "$1" "$_patches"; continue
 	done
 }
 
@@ -155,12 +126,9 @@ nukeblobs()
 	pjcfgdir="${1%/}"
 	pjsrcdir="${2%/}"
 	pjsrcdir="${pjsrcdir#src/}"
-	if [ ! -f "config/${pjcfgdir}/blobs.list" ]; then
-		[ "${project}" != "coreboot" ] && [ "${project}" != "u-boot" ] \
-			&& return 0
-		err "nukeblobs config/${pjcfgdir}: blobs.list file missing"
-	fi
-	while read blobfile; do
+	[ ! -f "config/${pjcfgdir}/blobs.list" ] && return 0
+
+	while read -r blobfile; do
 		rmf="$(realpath "src/${pjsrcdir}/${blobfile}" 2>/dev/null)" || \
 		    continue
 		[ -L "${rmf}" ] && continue # we will delete the actual file
@@ -173,6 +141,7 @@ nukeblobs()
 		    err "nukeblobs ${pjcfgdir}/blobs: can't rm \"${blobfile}\""
 		printf "nukeblobs %s: deleted \"%s\"\n" "${pjcfgdir}" "${rmf}"
 	done < "config/${pjcfgdir}/blobs.list"
+
 	[ "${del}" = "y" ] && return 0
 	printf "nukeblobs %s: no defined blobs exist in dir, src/%s\n" 1>&2 \
 	    "${pjcfgdir}" "${pjsrcdir}"
diff --git a/include/option.sh b/include/option.sh
index d3203e4..dd53602 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -1,20 +1,26 @@
 # SPDX-License-Identifier: GPL-3.0-only
 # SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 # SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
+# SPDX-FileCopyrightText: 2020-2024 Leah Rowe <leah@libreboot.org>
 
 cbdir="src/coreboot/default"
 cbcfgsdir="config/coreboot"
+ifdtool="cbutils/default/ifdtool"
 cbfstool="cbutils/default/cbfstool"
+grubcfgsdir="config/grub"
+layoutdir="/boot/grub/layouts"
+. "${grubcfgsdir}/modules.list"
+tmpgit="${PWD}/tmp/gitclone"
 
 eval "$(setvars "" board boarddir)"
 
 items()
 {
 	rval=1
-	[ ! -d "${1}" ] && \
-		printf "items: directory '%s' doesn't exist" "${1}" && \
-		    return 1
+	if [ ! -d "${1}" ]; then
+		printf "items: directory '%s' doesn't exist" "${1}" 1>&2
+		return 1
+	fi
 	for x in "${1}/"*; do
 		# -e used because this is for files *or* directories
 		[ -e "${x}" ] || continue
@@ -35,30 +41,38 @@ scan_config()
 	    "${_fail}" "scan_config ${confdir}: Cannot concatenate files"
 	while read -r line ; do
 		set ${line} 1>/dev/null 2>/dev/null || :
-		[ "${1%:}" = "depend" ] && depend="${depend} ${2}" && continue
-		eval "${1%:}=\"${2}\""
+		if [ "${1%:}" = "depend" ]; then
+			depend="${depend} ${2}"
+		else
+			eval "${1%:}=\"${2}\""
+		fi
 	done << EOF
 	$(eval "awk '${awkstr}' \"${revfile}\"")
 EOF
-	rm -f "${revfile}" || "${_fail}" "scan_config: Cannot remove tmpfile"
+	rm -f "$revfile" || "$_fail" "scan_config: Cannot remove tmpfile"
 }
 
 check_defconfig()
 {
 	for x in "${1}"/config/*; do
-		[ -f "${x}" ] && return 0
+		[ -f "${x}" ] && return 1
 	done
-	return 1
 }
 
-# in canoeboot 20231026, we only need cbfstool.
-# libreboot also builds ifdtool here.
 handle_coreboot_utils()
 {
-	x_ ./update trees ${_f} "src/coreboot/${1}/util/cbfstool"
-	[ -z "${mode}" ] && [ ! -f "cbutils/${1}/cbfstool" ] && \
-		x_ mkdir -p "cbutils/${1}" && \
-		x_ cp "src/coreboot/${1}/util/cbfstool/cbfstool" \
-		    "cbutils/${1}"
-	[ -z "${mode}" ] || x_ rm -Rf "cbutils/${1}"
+	for util in cbfstool ifdtool; do
+		x_ ./update trees ${_f} "src/coreboot/${1}/util/${util}"
+		[ -z "${mode}" ] && [ ! -f "cbutils/${1}/${util}" ] && \
+			x_ mkdir -p "cbutils/${1}" && \
+			x_ cp "src/coreboot/${1}/util/${util}/${util}" \
+			    "cbutils/${1}"
+		[ -z "${mode}" ] || x_ rm -Rf "cbutils/${1}"
+	done
+}
+
+remkdir()
+{
+	rm -Rf "${1}" || err "remkdir: !rm -Rf \"${1}\""
+	mkdir -p "${1}" || err "remkdir: !mkdir -p \"${1}\""
 }
diff --git a/script/build/grub b/script/build/grub
deleted file mode 100755
index 31fc008..0000000
--- a/script/build/grub
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2014,2015,2020,2021,2023 Leah Rowe <leah@libreboot.org>
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-. "include/err.sh"
-
-elfdir="elf/grub"
-grubcfgsdir="config/grub"
-layoutdir="/boot/grub/layouts"
-
-. "${grubcfgsdir}/modules.list"
-
-main()
-{
-	handle_dependencies
-	build_keymap_configs
-	build_grub_payload
-	printf "GRUB files now available under directory: %s\n" "${elfdir}"
-}
-
-handle_dependencies()
-{
-	[ -d "src/grub" ] || x_ ./update trees -f grub
-	[ -f "src/grub/grub-mkstandalone" ] || build_grub_utils
-	x_ mkdir -p "${elfdir}"
-	rm -f "${elfdir}/"* || err "!rm elf, handle_, ${elfdir}/"
-}
-
-build_grub_utils()
-{
-	(
-	x_ cd "src/grub"
-	[ ! -d Makefile ] || x_ make distclean
-	x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git
-	x_ ./autogen.sh
-	x_ ./configure --with-platform=coreboot
-	make -j$(nproc) FS_PAYLOAD_MODULES="" || err "!mk grub utils"
-	)
-}
-
-build_keymap_configs()
-{
-	for keylayoutfile in "${grubcfgsdir}/keymap/"*.gkb; do
-		[ -f "${keylayoutfile}" ] || continue
-		keymap="${keylayoutfile##${grubcfgsdir}/keymap/}"
-		keymap="${keymap%.gkb}"
-		printf "keymap %s\n" "${keymap}" > \
-		    "${elfdir}/keymap_${keymap}.cfg" || err "!insert keymap"
-	done
-}
-
-build_grub_payload()
-{
-	./src/grub/grub-mkstandalone \
-	    --grub-mkimage="src/grub/grub-mkimage" \
-	    -O i386-coreboot \
-	    -o "${elfdir}/grub.elf" \
-	    -d "src/grub/grub-core/" \
-	    --fonts= --themes= --locales=  \
-	    --modules="${grub_modules}" \
-	    --install-modules="${grub_install_modules}" \
-	    "${layoutdir}/colemak.gkb=${grubcfgsdir}/keymap/colemak.gkb" \
-	    "${layoutdir}/deqwertz.gkb=${grubcfgsdir}/keymap/deqwertz.gkb" \
-	    "${layoutdir}/esqwerty.gkb=${grubcfgsdir}/keymap/esqwerty.gkb" \
-	    "${layoutdir}/frazerty.gkb=${grubcfgsdir}/keymap/frazerty.gkb" \
-	    "${layoutdir}/frdvbepo.gkb=${grubcfgsdir}/keymap/frdvbepo.gkb" \
-	    "${layoutdir}/itqwerty.gkb=${grubcfgsdir}/keymap/itqwerty.gkb" \
-	    "${layoutdir}/svenska.gkb=${grubcfgsdir}/keymap/svenska.gkb" \
-	    "${layoutdir}/trqwerty.gkb=${grubcfgsdir}/keymap/trqwerty.gkb" \
-	    "${layoutdir}/ukdvorak.gkb=${grubcfgsdir}/keymap/ukdvorak.gkb" \
-	    "${layoutdir}/ukqwerty.gkb=${grubcfgsdir}/keymap/ukqwerty.gkb" \
-	    "${layoutdir}/usdvorak.gkb=${grubcfgsdir}/keymap/usdvorak.gkb" \
-	    "${layoutdir}/usqwerty.gkb=${grubcfgsdir}/keymap/usqwerty.gkb" \
-	    "/boot/grub/grub.cfg=${grubcfgsdir}/config/grub_memdisk.cfg" \
-	    "/boot/grub/grub_default.cfg=${grubcfgsdir}/config/grub.cfg" || \
-	    err "build_grub_elf: cannot build grub payload (grub-mkstandalone)"
-}
-
-main $@
diff --git a/script/build/roms b/script/build/roms
index 266d2bd..a369d0e 100755
--- a/script/build/roms
+++ b/script/build/roms
@@ -1,12 +1,11 @@
 #!/usr/bin/env sh
 # SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023 Leah Rowe <leah@libreboot.org>
+# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023,2024 Leah Rowe <leah@libreboot.org>
 # SPDX-FileCopyrightText: 2021,2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
 # SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 # SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
 # SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com>
 
-[ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
 . "include/err.sh"
@@ -16,23 +15,28 @@ seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
 grub_background="background1280x800.png"
 grubelf="elf/grub/grub.elf"
 cfgsdir="config/coreboot"
-kmapdir="config/grub/keymap"
 
 # Disable all payloads by default.
 # target.cfg files have to specifically enable [a] payload(s)
-pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest"
+pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t"
 pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin"
-v="romdir cbrom initmode displaymode cbcfg targetdir tree arch"
+v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps"
 v="${v} grub_timeout ubdir board grub_scan_disk uboot_config"
 eval "$(setvars "n" ${pv})"
 eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)"
 
 main()
 {
+	check_project
+
 	while [ $# -gt 0 ]; do
 		case ${1} in
-		help) usage && exit 0 ;;
-		list) items config/coreboot && exit 0 ;;
+		help)
+			usage
+			exit 0 ;;
+		list)
+			items config/coreboot || :
+			exit 0 ;;
 		-d) _displaymode="${2}" ;;
 		-p) _payload="${2}" ;;
 		-k) _keyboard="${2}" ;;
@@ -48,24 +52,25 @@ main()
 	    err "Cannot generate list of boards for building"
 
 	for x in ${boards}; do
-		eval "$(setvars "n" ${pv})"
-		eval "$(setvars "" ${v})"
+		eval "$(setvars "n" ${pv}) $(setvars "" ${v})"
 		grub_background="background1280x800.png"
 		board="${x}"
-		check_target
-		prepare_target
+		configure_target
+		build_payloads
+		build_target_mainboard
 		[ -d "bin/${board}" ] || continue
 		targets="* bin/${board}\n${targets}"
 	done
 
 	[ -z "${targets}" ] && err "No ROM images were compiled"
 	printf "\nROM images available in these directories:\n"
-	printf "${targets}^^ ROM images available in these directories.\n\n"
+	eval "printf \"${targets}\""
+	printf "^^ ROM images available in these directories.\n\n"
 
-	printf "DO NOT flash ROM images from elf/ - please use bin/ instead.\n"
+	printf "DO NOT flash images from elf/ - please use bin/ instead.\n"
 }
 
-check_target()
+configure_target()
 {
 	targetdir="${cfgsdir}/${board}"
 	[ -f "${targetdir}/target.cfg" ] || \
@@ -74,43 +79,34 @@ check_target()
 	# Override the above defaults using target.cfg
 	. "${targetdir}/target.cfg"
 
-	[ -z "${grub_scan_disk}" ] && \
-		grub_scan_disk="both"
-	[ "${grub_scan_disk}" != "both" ] && [ "${grub_scan_disk}" != "ata" ] \
+	[ -z "${grub_scan_disk}" ] && grub_scan_disk="both"
+	[ "$grub_scan_disk" != "both" ] && [ "$grub_scan_disk" != "ata" ] \
 	    && [ "${grub_scan_disk}" != "ahci" ] && \
 		grub_scan_disk="both"
 
-	[ -z "${tree}" ] && \
-		err "Target '${board}' defines no tree. Skipping build."
-	[ -z "${arch}" ] && \
-		err "Target '${board}' defines no arch. Skipping build."
+	[ -z "$tree" ] && err "$board: tree not defined"
 
-	[ "${payload_memtest}" != "y" ] && \
-		payload_memtest="n"
-	[ "${payload_grub_withseabios}" = "y" ] && \
-		payload_grub="y"
+	[ "${payload_memtest}" != "y" ] && payload_memtest="n"
+	[ "${payload_grub_withseabios}" = "y" ] && payload_grub="y"
 	[ "${payload_grub_withseabios}" = "y" ] && \
 		eval "$(setvars "y" payload_seabios payload_seabios_withgrub)"
-	[ "${payload_seabios_withgrub}" = "y" ] && \
-		payload_seabios="y"
-	if [ "${payload_seabios_grubonly}" = "y" ]; then
-		payload_seabios="y"
-		payload_seabios_withgrub="y"
-	fi
+	[ "$payload_seabios_withgrub" = "y" ] && payload_seabios="y"
+	[ "$payload_seabios_grubonly" = "y" ] && payload_seabios="y"
+	[ "$payload_seabios_grubonly" = "y" ] && payload_seabios_withgrub="y"
 
 	# The reverse logic must not be applied. If SeaBIOS-with-GRUB works,
 	# that doesn't mean GRUB-withSeaBIOS will. For example, the board
 	# might have a graphics card whose vga rom coreboot doesn't execute
-	[ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] && \
+	[ "$payload_grub" != "y" ] && [ "$payload_seabios" != "y" ] && \
 	    [ "${payload_uboot}" != "y" ] && \
 		for configfile in "${targetdir}/config/"*; do
 			[ -e "${configfile}" ] || continue
 			err "target '${board}' defines no payload"
 		done
 
-	[ "${payload_uboot}" != "n" ] && [ "${payload_uboot}" != "y" ] && \
+	[ "$payload_uboot" != "n" ] && [ "$payload_uboot" != "y" ] && \
 		payload_uboot="n"
-	[ "${payload_uboot}" = "y" ] && [ -z "${uboot_config}" ] && \
+	[ "$payload_uboot" = "y" ] && [ -z "$uboot_config" ] && \
 		uboot_config="default"
 
 	# Override all payload directives with cmdline args
@@ -122,7 +118,7 @@ check_target()
 	eval "payload_${_payload}=y"
 }
 
-prepare_target()
+build_payloads()
 {
 	romdir="bin/${board}"
 	cbdir="src/coreboot/${board}"
@@ -130,69 +126,76 @@ prepare_target()
 	cbfstool="cbutils/${tree}/cbfstool"
 	cbrom="${cbdir}/build/coreboot.rom"
 
-	[ -f "${cbfstool}" ] || \
-		x_ ./update trees -b coreboot utils ${tree}
-
-	build_dependency_seabios
+	[ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree
 
 	memtest_bin="memtest86plus/build64/memtest.bin"
 	[ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \
 		x_ ./update trees -b memtest86plus
 
-	rm -f "${romdir}/"* || err "!prepare, rm files, ${romdir}"
-
-	build_dependency_grub
-	build_dependency_uboot
-	build_target
+	[ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios
+	if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \
+	    || [ "$payload_seabios_grubonly" = "y" ]; then build_grub_payload
+	fi
+	[ "${payload_uboot}" = "y" ] && build_uboot_payload; return 0
 }
 
-build_dependency_seabios()
+build_grub_payload()
 {
-	[ "${payload_seabios}" = "y" ] || return 0
-	[ -f "${seavgabiosrom}" ] && \
-	    [ -f elf/seabios/default/libgfxinit/bios.bin.elf ] && \
-	    [ -f elf/seabios/default/vgarom/bios.bin.elf ] && \
-	    [ -f elf/seabios/default/normal/bios.bin.elf ] && return 0
+	x_ mkdir -p elf/grub
 
-	x_ ./update trees -b seabios
-}
-
-build_dependency_grub()
-{
-	[ "${payload_grub}" != "y" ] && \
-	    [ "${payload_seabios_withgrub}" != "y" ] && \
-	    [ "${payload_seabios_grubonly}" != "y" ] && return 0
-
-	rebuild_grub="n"
-	[ -f "${grubelf}" ] || rebuild_grub="y"
-	for keymapfile in "${kmapdir}"/*.gkb; do
-		[ "${rebuild_grub}" = "y" ] || break
+	for keymapfile in config/grub/keymap/*.gkb; do
 		[ -f "${keymapfile}" ] || continue
 
+		keymaps="${keymaps} ${keymapfile}"
 		keymap="${keymapfile##*/}"
 		keymap="${keymap%.gkb}"
-		[ ! -f "elf/grub/keymap_${keymap}.cfg" ] && \
-		    rebuild_grub="y" && break
+		[ -f "elf/grub/keymap_$keymap.cfg" ] || printf "keymap %s\n" \
+		    "$keymap" > "elf/grub/keymap_$keymap.cfg" || err "!key"; :
 	done
-	[ "${rebuild_grub}" = "y" ] || return 0
-	x_ ./build grub
+	[ -n "${_keyboard}" ] && keymaps="${kmapdir}/${_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}" \
+	    "${layoutdir}/colemak.gkb=${grubcfgsdir}/keymap/colemak.gkb" \
+	    "${layoutdir}/deqwertz.gkb=${grubcfgsdir}/keymap/deqwertz.gkb" \
+	    "${layoutdir}/esqwerty.gkb=${grubcfgsdir}/keymap/esqwerty.gkb" \
+	    "${layoutdir}/frazerty.gkb=${grubcfgsdir}/keymap/frazerty.gkb" \
+	    "${layoutdir}/frdvbepo.gkb=${grubcfgsdir}/keymap/frdvbepo.gkb" \
+	    "${layoutdir}/itqwerty.gkb=${grubcfgsdir}/keymap/itqwerty.gkb" \
+	    "${layoutdir}/svenska.gkb=${grubcfgsdir}/keymap/svenska.gkb" \
+	    "${layoutdir}/trqwerty.gkb=${grubcfgsdir}/keymap/trqwerty.gkb" \
+	    "${layoutdir}/ukdvorak.gkb=${grubcfgsdir}/keymap/ukdvorak.gkb" \
+	    "${layoutdir}/ukqwerty.gkb=${grubcfgsdir}/keymap/ukqwerty.gkb" \
+	    "${layoutdir}/usdvorak.gkb=${grubcfgsdir}/keymap/usdvorak.gkb" \
+	    "${layoutdir}/usqwerty.gkb=${grubcfgsdir}/keymap/usqwerty.gkb" \
+	    "/boot/grub/grub.cfg=${grubcfgsdir}/config/grub_memdisk.cfg" \
+	    "/boot/grub/grub_default.cfg=${grubcfgsdir}/config/grub.cfg" || \
+	    err "could not generate grub.elf"
 }
 
-build_dependency_uboot()
+build_uboot_payload()
 {
-	[ "${payload_uboot}" = "y" ] || return 0
-
 	x_ ./update trees -b u-boot ${board}
 	ubdir="elf/u-boot/${board}/${uboot_config}"
 	ubootelf="${ubdir}/u-boot.elf"
 	[ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot" ] && \
 		ubootelf="${ubdir}/u-boot"
 	[ -f "${ubootelf}" ] && return 0
-	err "Could not find u-boot build for board, ${board}"
+	err "Can't find u-boot build for board, $board";
 }
 
-build_target()
+build_target_mainboard()
 {
+	rm -f "${romdir}/"* || err "!prepare, rm files, ${romdir}"
+
 	for x in "normal" "vgarom" "libgfxinit"; do
 		initmode="${x}"
 		hmode="vesafb"
@@ -214,16 +217,18 @@ build_target()
 build_roms()
 {
 	cbcfg="${1}"
-	[ ! -f "${cbcfg}" ] && \
+	if [ ! -f "${cbcfg}" ]; then
 		printf "'%s' does not exist. Skipping build for %s %s %s\n" \
-		    "${cbcfg}" "${board}" "${displaymode}" "${initmode}" \
-		    1>&2 && return 0
+		    "$cbcfg" "$board" "$displaymode" "$initmode" 1>&2
+		return 0
+	fi
 
 	x_ ./update trees -b coreboot ${board}
 
-	_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH/${board}/${initmode}_${displaymode}"
+	_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH"
+	_cbrom="${_cbrom}/${board}/${initmode}_${displaymode}"
 	[ "${initmode}" = "normal" ] && \
-		_cbrom="${_cbrom%_${displaymode}}"
+		_cbrom="${_cbrom%"_${displaymode}"}"
 	_cbrom="${_cbrom}/coreboot.rom"
 	cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
 	x_ cp "${_cbrom}" "${cbrom}"
@@ -231,10 +236,8 @@ build_roms()
 	[ "${payload_memtest}" != "y" ] || \
 		x_ "${cbfstool}" "${cbrom}" add-payload \
 		    -f "src/${memtest_bin}" -n img/memtest -c lzma
-	[ "${payload_seabios}" = "y" ] && \
-		build_seabios_roms
-	[ "${payload_grub}" != "y" ] || \
-		x_ build_grub_roms "${cbrom}" "grub"
+	[ "${payload_seabios}" = "y" ] && build_seabios_roms
+	[ "$payload_grub" != "y" ] || x_ build_grub_roms "$cbrom" "grub"
 	[ "${payload_uboot}" = "y" ] || return 0
 	x_ cp "${_cbrom}" "${cbrom}"
 	build_uboot_roms
@@ -243,10 +246,9 @@ build_roms()
 build_seabios_roms()
 {
 	if [ "${payload_seabios_withgrub}" = "y" ]; then
-		tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
-		x_ cp "${cbrom}" "${tmprom}"
-		x_ build_grub_roms "${tmprom}" "seabios_withgrub"
-		x_ rm -f "${tmprom}"
+		t=$(mktemp -t coreboot_rom.XXXXXXXXXX)
+		x_ cp "${cbrom}" "${t}"
+		x_ build_grub_roms "${t}" "seabios_withgrub"
 	else
 		t=$(mkSeabiosRom "${cbrom}" "fallback/payload") || \
 		    err "build_seabios_roms: cannot build tmprom"
@@ -254,8 +256,8 @@ build_seabios_roms()
 		[ "${initmode}" = "normal" ] && newrom="${romdir}/seabios" \
 			&& newrom="${newrom}_${board}_${initmode}"
 		x_ moverom "${t}" "${newrom}.rom"
-		x_ rm -f "${t}"
 	fi
+	x_ rm -f "${t}"
 }
 
 # Make separate ROM images with GRUB payload, for each supported keymap
@@ -265,11 +267,18 @@ build_grub_roms()
 	payload1="${2}" # allow values: grub, seabios, seabios_withgrub
 
 	grub_cbfs="fallback/payload"
-	[ "${payload1}" = "grub" ] && [ "${payload_grub_withseabios}" = "y" ] \
-		&& x_ mv "$(mkSeabiosRom "${tmprom}" "seabios.elf")" "${tmprom}"
-	[ "${payload1}" != "grub" ] && [ "${payload_seabios_withgrub}" = "y" ] \
-		&& grub_cbfs="img/grub2" && \
-		x_ mv "$(mkSeabiosRom "${tmprom}" fallback/payload)" "${tmprom}"
+	if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ]
+	then
+		_tmpmvrom=$(mkSeabiosRom "$tmprom" "seabios.elf") || \
+		    err "build_grub_roms 1 $board: can't build tmprom"
+		x_ mv "$_tmpmvrom" "$tmprom"
+	elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ]
+	then
+		grub_cbfs="img/grub2"
+		_tmpmvrom=$(mkSeabiosRom "$tmprom" fallback/payload) || \
+		    err "build_grub_roms 2 $board: can't build tmprom"
+		x_ mv "$_tmpmvrom" "$tmprom"
+	fi
 
 	# we only need insert grub.elf once, for each coreboot config:
 	x_ "${cbfstool}" "${tmprom}" add-payload -f "${grubelf}" \
@@ -280,31 +289,27 @@ build_grub_roms()
 	    [ "${displaymode}" = "corebootfb" ]; then
 		backgroundfile="config/grub/background/${grub_background}"
 		"${cbfstool}" "${tmprom}" add -f ${backgroundfile} \
-		    -n background.png -t raw || err "insert background, ${backgroundfile}"
+		    -n background.png -t raw || \
+		    err "insert background, ${backgroundfile}"
 	fi
 
 	tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX)
-	printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}" \
-	    || err "set grub_scandisk, ${grub_scan_disk}, ${tmpcfg}"
+	printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" >"$tmpcfg" \
+	    || err "set grub_scandisk, $grub_scan_disk, $tmpcfg"
 	[ "${grub_scan_disk}" = "both" ] || \
-	    x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw
+	    x_ "$cbfstool" "$tmprom" add -f "$tmpcfg" -n scan.cfg -t raw
 	printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" || \
 	    err "set timeout, ${grub_timeout}, ${tmpcfg}"
 	[ -z "${grub_timeout}" ] || x_ "${cbfstool}" "${tmprom}" add \
 	    -f "${tmpcfg}" -n timeout.cfg -t raw
 	x_ rm -f "${tmpcfg}"
 
-	keymaps=""
-	for kmapfile in "${kmapdir}"/*; do
-		keymaps="${keymaps} ${kmapfile}"
-	done
-	[ -z "${_keyboard}" ] || keymaps="${kmapdir}/${_keyboard}.gkb"
-
 	for keymapfile in ${keymaps}; do
 		[ -f "${keymapfile}" ] || continue
 		keymap="${keymapfile##*/}"
 		keymap="${keymap%.gkb}"
-		tmpgrubrom="$(mkGrubRom "${keymap}" "${tmprom}")"
+		tmpgrubrom=$(mkGrubRom "${keymap}" "${tmprom}") || \
+		    err "build_grub_roms ${board}: could not create tmprom"
 
 		newrom="${romdir}/${payload1}_${board}_${initmode}_"
 		newrom="${newrom}${displaymode}_${keymap}.rom"
@@ -327,7 +332,7 @@ mkGrubRom() {
 
 	tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
 	x_ cp "${_cbrom}" "${tmprom}"
-	x_ "${cbfstool}" "${tmprom}" add -f "${keymapcfg}" -n keymap.cfg -t raw
+	x_ "$cbfstool" "$tmprom" add -f "$keymapcfg" -n keymap.cfg -t raw
 
 	printf "%s\n" "${tmprom}"
 }
@@ -341,15 +346,15 @@ mkSeabiosRom() {
 	tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
 
 	x_ cp "${_cbrom}" "${tmprom}"
-	x_ "${cbfstool}" "${tmprom}" add-payload -f "${_seabioself}" \
-	    -n ${_seabios_cbfs_path} -c lzma
-	x_ "${cbfstool}" "${tmprom}" add-int -i 3000 -n etc/ps2-keyboard-spinup
+	x_ "$cbfstool" "$tmprom" add-payload -f "$_seabioself" \
+	    -n "${_seabios_cbfs_path}" -c lzma
+	x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup
 
-	z="2"; [ "${initmode}" = "vgarom" ] && z="0"
-	x_ "${cbfstool}" "${tmprom}" add-int -i $z -n etc/pci-optionrom-exec
-	x_ "${cbfstool}" "${tmprom}" add-int -i 0 -n etc/optionroms-checksum
-	[ "${initmode}" != "libgfxinit" ] || \
-		x_ "${cbfstool}" "${tmprom}" add -f "${seavgabiosrom}" \
+	z="2"; [ "$initmode" = "vgarom" ] && z="0"
+	x_ "$cbfstool" "$tmprom" add-int -i $z -n etc/pci-optionrom-exec
+	x_ "$cbfstool" "$tmprom" add-int -i 0 -n etc/optionroms-checksum
+	[ "$initmode" != "libgfxinit" ] || \
+		x_ "$cbfstool" "$tmprom" add -f "$seavgabiosrom" \
 		    -n vgaroms/seavgabios.bin -t raw
 
 	printf "%s\n" "${tmprom}"
@@ -364,22 +369,20 @@ mkSeabiosGrubonlyRom()
 	tmpbootorder=$(mktemp -t coreboot_rom.XXXXXXXXXX)
 
 	# only load grub, by inserting a custom bootorder file
-	printf "/rom@img/grub2\n" > "${tmpbootorder}" || err "printf bootorder"
+	printf "/rom@img/grub2\n" > "$tmpbootorder" || err "printf bootorder"
 	x_ "${cbfstool}" "${_grubrom}" \
 	    add -f "${tmpbootorder}" -n bootorder -t raw
 	x_ rm -f "${tmpbootorder}"
 
 	x_ "${cbfstool}" "${_grubrom}" add-int -i 0 -n etc/show-boot-menu
-
 	x_ moverom "${_grubrom}" "${_newrom%.rom}_grubonly.rom"
 }
 
 build_uboot_roms()
 {
-	tmprom="$(mkUbootRom "${cbrom}" "fallback/payload")"
+	tmprom=$(mkUbootRom "${cbrom}" "fallback/payload") || \
+	    err "build_uboot_roms $board: could not create tmprom"
 	newrom="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom"
-	[ "${initmode}" = "normal" ] && \
-		newrom="${romdir}/uboot_payload_${board}_${initmode}.rom"
 	x_ moverom "${tmprom}" "${newrom}"
 	x_ rm -f "${tmprom}"
 }
@@ -392,55 +395,23 @@ mkUbootRom() {
 	_ubdir="elf/u-boot/${board}/${uboot_config}"
 	_ubootelf="${_ubdir}/u-boot.elf"
 	[ -f "${_ubootelf}" ] || _ubootelf="${_ubdir}/u-boot"
-	[ -f "${_ubootelf}" ] || err "mkUbootRom: ${board}: cant find u-boot"
+	[ -f "$_ubootelf" ] || err "mkUbootRom: $board: cant find u-boot"
 
 	tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
 
 	x_ cp "${_cbrom}" "${tmprom}"
-	x_ "${cbfstool}" "${tmprom}" add-payload -f "${_ubootelf}" \
-	    -n ${_uboot_cbfs_path} -c lzma
+	x_ "$cbfstool" "$tmprom" add-payload -f "$_ubootelf" \
+	    -n "${_uboot_cbfs_path}" -c lzma
 
 	printf "%s\n" "${tmprom}"
 }
 
-# it is assumed that no other work will be done on the ROM
-# after calling this function. therefore this function is "final"
-moverom() {
-	rompath="${1}"
-	newrom="${2}"
-
-	printf "Creating target image: %s\n" "${newrom}"
-
-	[ -d "${newrom%/*}" ] || x_ mkdir -p "${newrom%/*}/"
-
-	x_ modify_coreboot_rom
-	x_ cp "${rompath}" "${newrom}"
-}
-
-modify_coreboot_rom()
+moverom()
 {
-	tmpmvrom="$(mktemp -t rom.XXXXXXXXXX)"
-	x_ rm -f "${tmpmvrom}"
+	printf "Creating target image: %s\n" "$2"
 
-	if [ "${romtype}" = "d8d16sas" ]; then
-		# pike2008 roms hang seabios. an empty rom will override
-		# the built-in one, thus disabling all execution of it
-		x_ touch "${tmpmvrom}"
-		for deviceID in "0072" "3050"; do
-			x_ "${cbfstool}" "${rompath}" add -f "${tmpmvrom}" \
-			    -n "pci1000,${deviceID}.rom" -t raw
-		done
-	elif [ "${romtype}" = "i945 laptop" ]; then
-		# for bucts-based installation method from factory bios
-               dd if="${rompath}" of="${tmpmvrom}" bs=1 \
-                   skip=$(($(stat -c %s "${rompath}") - 0x10000)) \
-                   count=64k || err "modrom 1, copy bootblock"
-               dd if="${tmpmvrom}" of="${rompath}" bs=1 \
-                   seek=$(($(stat -c %s "${rompath}") - 0x20000)) count=64k \
-                   conv=notrunc || err "modrom 2, insert new bootblock"
-               x_ rm -f "${tmpmvrom}"
-	fi
-	x_ rm -f "${tmpmvrom}"
+	x_ mkdir -p "${2%/*}"
+	x_ cp "$1" "$2"
 }
 
 usage()
diff --git a/script/build/serprog b/script/build/serprog
index 93ea930..8b003ad 100755
--- a/script/build/serprog
+++ b/script/build/serprog
@@ -1,13 +1,13 @@
 #!/usr/bin/env sh
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com>
+# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
 
-[ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
 . "include/err.sh"
 
-eval "$(setvars "" platform pico_sdk_dir pico_src_dir stm32_src_dir boards_dir)"
+eval "$(setvars "" pico_sdk_dir pico_src_dir stm32_src_dir boards_dir)"
 
 pico_src_dir=src/pico-serprog
 pico_sdk_dir=src/pico-sdk
@@ -18,28 +18,24 @@ usage="usage: ./build firmware serprog <rp2040|stm32> [board]"
 main()
 {
 	[ -z "${1+x}" ] && err "${usage}"
+	[ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && err "$usage"
 	if [ "${1}" = "rp2040" ]; then
-		platform="rp2040"
 		boards_dir=${pico_sdk_dir}/src/boards/include/boards
-		[ -d "${pico_src_dir}/" ] || \
-			x_ ./update trees -f "pico-serprog"
+		[ -d "$pico_src_dir" ] || x_ ./update trees -f "pico-serprog"
 	elif [ "${1}" = "stm32" ]; then
-		platform="stm32"
 		boards_dir=${stm32_src_dir}/boards
-		[ -d "${stm32_src_dir}/" ] || \
-			x_ ./update trees -f "stm32-vserprog"
-	else
-		err "${usage}"
+		[ -d "$stm32_src_dir" ] || x_ ./update trees -f "stm32-vserprog"
 	fi
-	x_ mkdir -p "bin/serprog_${platform}"
+	x_ mkdir -p "bin/serprog_${1}"
 
-	if [ $# -gt 1 ] ; then
-		[ "${2}" = "list" ] && print_boards ${boards_dir} && return 0
-		build_${platform}_rom "${2}"
+	if [ $# -gt 1 ] && [ "${2}" = "list" ]; then
+		print_boards ${boards_dir}
+	elif [ $# -gt 1 ]; then
+		build_${1}_rom "${2}"
 	else
 		printf "Building all serprog targets\n"
-		list_boards "${boards_dir}" | while read board; do
-			build_${platform}_rom "${board}"
+		list_boards "${boards_dir}" | while read -r board; do
+			build_${1}_rom "${board}"
 		done
 	fi
 }
@@ -47,24 +43,24 @@ main()
 build_rp2040_rom()
 {
 	board=${1}
-	printf "Building pico-serprog for ${board}\n"
-	x_ cmake -DPICO_BOARD="${board}" -DPICO_SDK_PATH="${pico_sdk_dir}" \
+	printf "Building pico-serprog for %s\n" "${board}"
+	x_ cmake -DPICO_BOARD="$board" -DPICO_SDK_PATH="$pico_sdk_dir" \
 	    -B "${pico_src_dir}/build" "${pico_src_dir}"
 	x_ cmake --build "${pico_src_dir}/build"
 	x_ mv ${pico_src_dir}/build/pico_serprog.uf2 \
 	   bin/serprog_rp2040/serprog_${board}.uf2
-	printf "output to bin/serprog_rp2040/serprog_${board}.uf2\n"
+	printf "output to bin/serprog_rp2040/serprog_%s.uf2\n" "$board"
 }
 
 build_stm32_rom()
 {
 	board=${1}
-	printf "Building stm32-vserprog for ${board}\n"
-	x_ make -C ${stm32_src_dir} libopencm3-just-make BOARD=${board}
+	printf "Building stm32-vserprog for %s\n" "${board}"
+	x_ make -C $stm32_src_dir libopencm3-just-make BOARD=$board
 	x_ make -C ${stm32_src_dir} BOARD=${board}
 	x_ mv ${stm32_src_dir}/stm32-vserprog.hex \
 	   bin/serprog_stm32/serprog_${board}.hex
-	printf "output to bin/serprog_stm32/serprog_${board}.hex\n"
+	printf "output to bin/serprog_stm32/serprog_%s.hex\n" "$board"
 }
 
 print_boards()
@@ -75,7 +71,7 @@ print_boards()
 
 list_boards()
 {
-	basename -a -s .h ${1}/*.h
+	basename -a -s .h "${1}/"*.h || err "list_boards $1: can't list boards"
 }
 
 main $@
diff --git a/script/update/release b/script/update/release
index b78ce44..a82d197 100755
--- a/script/update/release
+++ b/script/update/release
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: MIT
 # SPDX-FileCopyrightText: 2020-2023 Leah Rowe <leah@libreboot.org>
 
-[ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
 . "include/err.sh"
@@ -22,6 +21,8 @@ main()
 		esac
 	done
 
+	check_project
+
 	vdir="${vdir}/${version}"
 	relname="${projectname}-${version}"
 	src_dirname="${relname}_src"
@@ -39,7 +40,7 @@ mkvdir()
 {
 	mkdir -p "${vdir}" || err "mkvdir: !mkdir -p \"${vdir}\""
 	git clone . "${srcdir}" || err "mkdir: !gitclone \"${srcdir}\""
-	insert_version_files "${srcdir}" || err "mkvdir ${srcdir}: versionfile"
+	insert_version_files "$srcdir" || err "mkvdir $srcdir: versionfile"
 }
 
 build_release()
@@ -49,48 +50,17 @@ build_release()
 	cd "${srcdir}" || err "${_xm}: !cd \"${srcdir}\""
 	fetch_trees
 	x_ mv src/docs docs
-	)
+	) || err "can't create release files"
 	(
 	cd "${srcdir%/*}" || err "${_xm}: mktarball \"${srcdir}\""
-	mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || err "${_xm}: mksrc"
-	)
-	[ "${mode}" = "src" ] && return 0 # for src mode, xgcc tarballs are
-					  # not included in the src archive
-
-	# now build roms, then copy crossgcc to src and re-compress
-	# while compressing rom images too.
+	mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || err "$_xm: mksrc"
+	) || err "can't create src tarball"
+	[ "${mode}" = "src" ] && return 0
 
 	(
 	cd "${srcdir}" || err "${_xm}: 2 !cd \"${srcdir}\""
 	mkrom_images
-	)
-	for _cbd in "${srcdir}/src/coreboot/"*; do
-		[ -d "${_cbd}/util/crossgcc/tarballs" ] || continue
-		_xgccdir="${vdir}/crossgcc/${_cbd##*/}"
-		mkdir -p "${_xgccdir}" || \
-		    err "build_release: !mkdir -p ${_xgccdir}"
-		cp -R "${_cbd}/util/crossgcc/tarballs/"* "${_xgccdir}" || \
-		    err "build_gcc: !copy xgcc ${_cbd}"
-	done
-	rm -Rf "${srcdir}" || err "build_release: !rm -Rf ${srcdir}"
-	(
-	cd "${srcdir%/*}" || err "${_xm} 2: mktarball \"${srcdir}\""
-	tar -xf "${srcdir##*/}.tar.xz" || err "!extract ${srcdir##*/}.tar.xz"
-	rm -f "${srcdir##*/}.tar.xz" || err "!rm -f ${srcdir##*/}.tar.xz"
-	)
-	for _xgcc in "${vdir}/crossgcc/"*; do
-		[ -d "${_xgcc}" ] || continue
-		mkdir -p "${srcdir}/src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs" || \
-		    err "!mkdir src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs"
-		mv "${_xgcc}/"* \
-		    "${srcdir}/src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs/" \
-		    || err "!move xgcc tarballs to ${srcdir}/xgcc/${_xgcc##*/}"
-	done
-	rm -Rf "${vdir}/crossgcc" || err "!rm -Rf \"${vdir}/crossgcc\""
-	(
-	cd "${srcdir%/*}" || err "${_xm}: mktarball \"${srcdir}\""
-	mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || err "${_xm}: mksrc"
-	)
+	) || err "can't build rom images"
 
 	rm -Rf "${srcdir}" || err "!rm -Rf ${srcdir}"
 }
@@ -108,8 +78,8 @@ fetch_trees()
 		    err "!rm -Rf \"src/${xp}/${xp}\""
 	done
 
-	find . -name ".git" -exec rm -Rf {} + || err "${_xm}: rm .git"
-	find . -name ".gitmodules" -exec rm -Rf {} + || err "${_xm}: rm .gitmod"
+	find . -name ".git" -exec rm -Rf {} + || err "$_xm: rm .git"
+	find . -name ".gitmodules" -exec rm -Rf {} + || err "$_xm: rm .gitmod"
 	x_ rm -Rf tmp .git
 }
 
@@ -145,28 +115,29 @@ handle_rom_archive()
 
 	romdir="${romdir}/bin/${target}"
 	mkdir -p "${romdir}" || err "!mkdir -p romdir, handle_rom_archive"
-	cp "${builddir}/"* "${romdir}" || err "!cp romdir, handle_rom_archive"
+	cp "$builddir/"* "$romdir" || err "!cp romdir, handle_rom_archive"
 
 	printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" \
 	    "${version}" "${projectname}" "${version}" "${target##*/}"
 	insert_version_files "${romdir}" || \
 	    err "mkrom_tarball ${romdir}: versionfile"
 
-	insert_copying_files "${romdir}" || err "!insert copy, handle 2, ${romdir}"
+	insert_copying_files "$romdir" || err "!insert copy, handle 2, $romdir"
 	mkrom_tarball
 }
 
 insert_copying_files()
 {
-	rm -Rf "${1}/licenses" || return 1
-	mkdir -p "${1}/licenses" || return 1
+	remkdir "${1}/licenses"
 	l="${1}/licenses"
 	# copy licenses to rom image archive, for completion
 	cp "src/grub/COPYING" "${l}/COPYING.grub" || return 1
 	cp "src/coreboot/default/COPYING" "${l}/COPYING.coreboot" || return 1
-	cp -R "src/coreboot/default/LICENSES" "${l}/LICENSES.coreboot" || return 1
+	cp -R "src/coreboot/default/LICENSES" "${l}/LICENSES.coreboot" || \
+	    return 1
 	cp "src/seabios/default/COPYING" "${l}/COPYING.coreboot" || return 1
-	cp "src/seabios/default/COPYING.LESSER" "${l}/COPYING.LESSER.seabios" || return 1
+	cp "src/seabios/default/COPYING.LESSER" "$l/COPYING.LESSER.seabios" \
+	    || return 1
 	cp -R "src/u-boot/default/Licenses" "${l}/COPYING.u-boot" || return 1
 	printf "Multiple licenses. Check corresponding %s source archive\n" \
 	    "${projectname}" > "${1}/COPYING" || return 1
@@ -178,13 +149,13 @@ mkrom_tarball()
 	f="release/${version}/roms/${archivename}"
 	mkdir -p "${f%/*}" || err "mkrom_tarball: !mkdir -p ${f%/*}"
 	(
-	cd "${romdir%/bin/${target}}" || err "!cd ${romdir%/bin/${target}}"
+	cd "${romdir%"/bin/$target"}" || err "!cd ${romdir%"/bin/$target"}"
 	mktarball "bin/${target}" "${archivename}.tar.xz"
-	)
-	mv "${romdir%/bin/${target}}/${archivename}.tar.xz"* "${f%/*}" || \
-	    err "!mktarball, rom, ${f%/*}/${romdir%/bin/${target}}/${archivename}.tar.xz"
+	) || err "can't create rom tarball"
+	mv "${romdir%"/bin/${target}"}/${archivename}.tar.xz"* "${f%/*}" || \
+	    err "mktar ${f%/*}/${romdir%"/bin/$target"}/$archivename.tar.xz"
 
-	printf "Created ROM archive: ${f%/*}/${archivename}.tar.xz"
+	printf "Created ROM archive: %s" "${f%/*}/${archivename}.tar.xz"
 }
 
 insert_version_files()
@@ -199,20 +170,21 @@ mktarball()
 	# preserve timestamps for reproducible tarballs
 	tar_implementation=$(tar --version | head -n1) || :
 
-	[ "${2%/*}" = "${2}" ] || mkdir -p "${2%/*}" || err "mk, !mkdir -p \"${2%/*}\""
+	[ "${2%/*}" = "${2}" ] || \
+		mkdir -p "${2%/*}" || err "mk, !mkdir -p \"${2%/*}\""
 	if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
 		tar --sort=name --owner=root:0 --group=root:0 \
-		    --mtime="UTC 2023-11-07" -c "${1}" | xz -T0 -9e > "${2}" || \
+		    --mtime="UTC 2023-11-06" -c "$1" | xz -T0 -9e > "$2" || \
 		    err "mktarball 1, ${1}"
 	else
 		# TODO: reproducible tarballs on non-GNU systems
-		tar -c "${1}" | xz -T0 -9e > "${2}" || err "mktarball 2, ${1}"
+		tar -c "$1" | xz -T0 -9e > "$2" || err "mktarball 2, $1"
 	fi
 	(
 	[ "${2%/*}" != "${2}" ] && x_ cd "${2%/*}"
 	sha512sum "${2##*/}" > "${2##*/}.sha512" || \
 	    err "!sha512sum \"${2##*/}\" > \"${2##*/}.sha512\""
-	)
+	) || err "failed to create tarball checksum"
 }
 
 main $@
diff --git a/script/update/trees b/script/update/trees
index aa997bc..85ce250 100755
--- a/script/update/trees
+++ b/script/update/trees
@@ -2,19 +2,17 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
 # SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
+# SPDX-FileCopyrightText: 2023-2024 Leah Rowe <leah@libreboot.org>
 
-[ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
 . "include/err.sh"
 . "include/option.sh"
 . "include/git.sh"
 
-export LOCALVERSION="-${projectname}-${version%%-*}"
-
-eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \
-    elfdir listfile project romtype target target_dir targets tree _f target1)"
+eval "$(setvars "" xarch cfgsdir codedir config config_name xlang mode \
+    elfdir listfile project target target_dir targets tree _f target1 \
+    bootstrapargs autoconfargs cmakedir makeargs autogenargs)"
 
 main()
 {
@@ -34,236 +32,228 @@ main()
 		esac
 		shift; project="${OPTARG#src/}"; shift
 	done
-	[ -z "${_f}" ] && err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)"
-	[ -z "${project}" ] && err "project name not specified"
+	[ -z "$_f" ] && err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)"
+	[ -z "$project" ] && err "project name not specified"
+	elfdir="elf/${project}"
+	cfgsdir="config/${project}"
 
-	[ -f "config/${project}/build.list" ] && build_targets $@ && return 0
-	build_projects $@
+	remkdir "${tmpgit%/*}"
+	check_project
+
+	_cmd="build_projects"
+	[ -f "config/${project}/build.list" ] && _cmd="build_targets"
+	$_cmd $@
 }
 
 build_projects()
 {
-	[ $# -gt 0 ] && x_ ./update trees ${_f} ${@}
+	[ $# -gt 0 ] && x_ ./update trees $_f $@
+	[ "$mode" = "fetch" ] && eval "fetch_project_repo; return 0;"
 
-	if [ "${mode}" = "fetch" ]; then
-		fetch_project_repo
-		for x in config/git/*; do
-			[ ! -f "${x}" ] && continue
-			nukeblobs "${x##*/}" "src/${x##*/}"
-		done
-		return 0
-	fi
+	load_project_config "$cfgsdir"
 
 	codedir="src/${project}"
-	[ -d "${codedir}" ] || x_ ./update trees -f "${project}"
+	[ -d "$codedir" ] || x_ ./update trees -f "$project"
 
-	[ "${mode}" = "distclean" ] && mode="clean"
+	[ "$mode" = "distclean" ] && mode="clean"
 	run_make_command || return 0
 }
 
 build_targets()
 {
-	elfdir="elf/${project}"
-	[ "${elfdir}" = "elf/coreboot" ] && \
+	[ "$elfdir" = "elf/coreboot" ] && \
 		elfdir="elf/coreboot_nopayload_DO_NOT_FLASH"
 
-	cfgsdir="config/${project}"
-	[ -d "${cfgsdir}" ] || err "directory, ${cfgsdir}, does not exist"
+	[ -d "$cfgsdir" ] || err "directory, $cfgsdir, does not exist"
 
 	listfile="${cfgsdir}/build.list"
-	[ -f "${listfile}" ] || err "list file, ${listfile}, does not exist"
+	[ -f "$listfile" ] || err "list file, $listfile, does not exist"
 
 	# Build for all targets if no argument is given
-	[ $# -gt 0 ] && target1="${1}"
-	[ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ] && \
+	[ $# -gt 0 ] && target1="$1"
+	[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \
 		shift 1
-	targets=$(items "${cfgsdir}") || \
-	    err "Cannot get options for ${cfgsdir}"
+	targets=$(items "$cfgsdir") || \
+	    err "Cannot get options for $cfgsdir"
 	[ $# -gt 0 ] && targets=$@
 
-	[ -z "${mode}" ] && x_ mkdir -p "${elfdir}/"
-
+	[ -z "$mode" ] && x_ mkdir -p "$elfdir"
 	handle_targets
 }
 
 handle_targets()
 {
-	for x in ${targets}; do
+	for x in $targets; do
 		target="${x}"
 		printf "Running 'make %s' for project '%s, target '%s''\n" \
-		    "${mode}" "${project}" "${target}"
+		    "$mode" "$project" "$target"
 		x_ handle_defconfig
 	done
 
-	[ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ] && return 0
-	[ -z "${mode}" ] || return 0
-	printf "Done! The files are stored under %s/\n\n" "${elfdir}"
+	[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0
+	[ -z "${mode}" ] && printf "Done! Check  %s/\n\n" "$elfdir"; return 0
 }
 
 handle_defconfig()
 {
-	handle_src_tree "${target}" || return 0
+	handle_src_tree "$target" || return 0
 
-	if [ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ]; then
-		handle_coreboot_utils "${tree}"
-		return 0
-	fi
+	[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \
+		eval "handle_coreboot_utils \"$tree\"; return 0"
 
 	for y in "${target_dir}/config"/*; do
-		[ -f "${y}" ] || continue
-		config="${y}"
-		config_name="${config#${target_dir}/config/}"
+		[ -f "$y" ] || continue
+		config="$y"
+		config_name="${config#"${target_dir}/config/"}"
 
 		printf "handle/make/config %s %s: handling config %s\n" \
-		    "${project}" "${target}" "${config_name}"
+		    "$project" "$target" "$config_name"
 
-		[ ! -z ${mode} ] || check_config || continue
+		[ -n "$mode" ] || check_config || continue
 		handle_makefile
-		[ ! -z ${mode} ] || copy_elf
+		[ -n "$mode" ] || copy_elf
 	done
 }
 
 handle_src_tree()
 {
-	romtype="normal"
 	target_dir="${cfgsdir}/${target}"
+	[ "$mode" = "fetch" ] && eval "fetch_project_trees; return 1;"
 
-	if [ "${mode}" = "fetch" ]; then
-		fetch_project_trees
-		nukeblobs "${project}/${tree}" "${project}/${tree}"
-		return 1
-	fi
+	load_project_config "$target_dir"
 
 	x_ mkdir -p "${elfdir}/${target}"
-	eval "$(setvars "" arch tree)"
 
-	. "${target_dir}/target.cfg" || \
-	    err "handle_src_tree ${target_dir}: cannot load target.cfg"
-
-	[ -z "${arch}" ] && err "handle_src_tree $project/$tree: arch unset"
-	[ -z "${tree}" ] && err "handle_src_tree $project/$tree: tree unset"
+	[ -z "$tree" ] && err "handle_src_tree $project/$tree: tree unset"
 
 	codedir="src/${project}/${tree}"
 
-	if [ ! -d "${codedir}" ]; then
-		if [ "${mode}" = "distclean" ] || \
-		    [ "${mode}" = "crossgcc-clean" ]; then
-			printf "Directory %s doesn't exist; skipping clean\n" \
-			    "${codedir}" 1>&2
+	if [ ! -d "$codedir" ]; then
+		if [ "$mode" = "distclean" ] || \
+		    [ "$mode" = "crossgcc-clean" ]; then
+			printf "Directory %s missing; skipping clean\n" \
+			    "$codedir" 1>&2
 			return 1
 		fi
-		x_ ./update trees -f "${project}" "${target}"
+		x_ ./update trees -f "$project" "$target"
 	fi
 
-	[ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ] && return 0
-	[ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && return 0
-
-	# u-boot and coreboot are both compiled with coreboot's crossgcc
-	[ -z "${mode}" ] || return 0
-	check_cross_compiler
+	[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0
+	[ -z "$mode" ] && check_cross_compiler; return 0
+}
+
+load_project_config()
+{
+	eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs)"
+
+	[ -f "${1}/target.cfg" ] || return 0
+	. "${1}/target.cfg" || \
+	    err "load_project_config ${1}: cannot load target.cfg"; return 0
 }
 
-# set up cross-compiler (coreboot crossgcc) for u-boot and coreboot
-# (seabios and grub currently use hostcc, not crossgcc)
 check_cross_compiler()
 {
-	[ "${crossgcc_ada}" = "y" ] || [ "${crossgcc_ada}" = "n" ] || \
-		crossgcc_ada="y"
-	[ "${crossgcc_ada}" = "y" ] || export BUILD_LANGUAGES=c
+	for _xarch in $xarch; do
+		cbdir="src/coreboot/${tree}"
+		[ "$project" != "coreboot" ] && cbdir="src/coreboot/default"
 
-	cbdir="src/coreboot/${tree}"
-	[ "${project}" != "coreboot" ] && cbdir="src/coreboot/default"
+		x_ ./update trees -f coreboot ${cbdir#src/coreboot/}
 
-	# only true if not building coreboot:
-	ctarget="${cbdir#src/coreboot/}"
-	[ -d "${cbdir}" ] || x_ ./update trees -f coreboot ${ctarget}
+		export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH"
+		export CROSS_COMPILE="${xarch% *}-"
+		[ -n "${xlang}" ] && export BUILD_LANGUAGES="$xlang"
 
-	if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
-		[ -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ] || \
-			x_ make -C "${cbdir}" crossgcc-i386 CPUS=$(nproc)
-		case "$(uname -m)" in
-			x86*|i*86|amd64) : ;;
-			*) export CROSS_COMPILE=i386-elf- ;;
-		esac
-	elif [ "${arch}" = "ARMv7" ]; then
-		[ -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ] || \
-			x_ make -C "${cbdir}" crossgcc-arm CPUS=$(nproc)
-		case "$(uname -m)" in
-			arm|arm32|armv6*|armv7*) : ;;
-			*) export CROSS_COMPILE=arm-eabi- ;;
-		esac
-	elif [ "${arch}" = "AArch64" ]; then
-		[ -d "${cbdir}/util/crossgcc/xgcc/aarch64-elf/" ] || \
-			x_ make -C "${cbdir}" crossgcc-aarch64 CPUS=$(nproc)
-		# aarch64 also needs armv7 toolchain for arm-trusted-firmware
-		[ -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ] || \
-			x_ make -C "${cbdir}" crossgcc-arm CPUS=$(nproc)
-		case "$(uname -m)" in
-			arm64|aarch64) : ;;
-			*) export CROSS_COMPILE=aarch64-elf- ;;
-		esac
-	fi
-
-	# we *must* ensure that u-boot's build system uses crossgcc first
-	export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH"
+		[ -d "${cbdir}/util/crossgcc/xgcc/${_xarch}/" ] && continue
+		x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$(nproc)
+	done
 }
 
 check_config()
 {
-	[ ! -f "${config}" ] && \
-		err "check_config: ${project}/${target}: configs missing"
+	[ -f "$config" ] || err "check_config: ${project}/${target}: no config"
 
 	dest_dir="${elfdir}/${target}/${config_name}"
 	# TODO: very hacky check. do it properly (based on build.list)
 	for elftest in "${dest_dir}"/*; do
-		[ -f "${elftest}" ] || continue
+		[ -f "$elftest" ] || continue
 		printf "Build already exists, so skipping build\n" 1>&2
 		return 1
 	done
-	x_ mkdir -p "${dest_dir}"
+	x_ mkdir -p "$dest_dir"
 }
 
 handle_makefile()
 {
-	x_ make clean -C "${codedir}"
-	x_ cp "${config}" "${codedir}/.config"
-	[ ! -z ${mode} ] || make -C "${codedir}" silentoldconfig || \
-	    make -C "${codedir}" oldconfig || :
+	x_ make clean -C "$codedir"
+	x_ cp "$config" "${codedir}/.config"
+	[ -n "$mode" ] || make -C "$codedir" silentoldconfig || \
+	    make -C "$codedir" oldconfig || :
 
-	run_make_command || err "handle_makefile ${codedir}: no makefile!"
+	run_make_command || err "handle_makefile $codedir: no makefile!"
 
-	if [ -e "${codedir}/.git" ] && [ "${project}" = "u-boot" ] && \
-	    [ "${mode}" = "distclean" ]; then
-		x_ git -C "${codedir}" clean -fdx
-	elif [ "${mode}" = "oldconfig" ] || [ "${mode}" = "olddefconfig" ] || \
-	    [ "${mode}" = "menuconfig" ] || [ "${mode}" = "nconfig" ]; then
-		x_ cp "${codedir}/.config" "${config}"
-	elif [ "${mode}" = "savedefconfig" ]; then
-		x_ cp "${codedir}/defconfig" "${config}"
+	if [ -e "${codedir}/.git" ] && [ "$project" = "u-boot" ] && \
+	    [ "$mode" = "distclean" ]; then
+		x_ git -C "$codedir" clean -fdx
+	elif [ "$mode" = "oldconfig" ] || [ "$mode" = "olddefconfig" ] || \
+	    [ "$mode" = "menuconfig" ] || [ "$mode" = "nconfig" ]; then
+		x_ cp "${codedir}/.config" "$config"
+	elif [ "$mode" = "savedefconfig" ]; then
+		x_ cp "${codedir}/defconfig" "$config"
 	fi
 }
 
 run_make_command()
 {
-	[ -f "${codedir}/Makefile" ] || [ -f "${codedir}/makefile" ] || \
-	    [ -f "${codedir}/GNUmakefile" ] || return 1
-	[ "${project}" = "coreboot" ] && [ -z "${mode}" ] && \
-		x_ printf "%s\n" "${version%%-*}" >"${codedir}/.coreboot-version"
+	check_cmake "$codedir"
+	[ -z "$mode" ] && check_autoconf "$codedir"
+	check_makefile "$codedir" || return 1
 
-	x_ make ${mode} -j$(nproc) -C "${codedir}"
+	[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \
+		printf "%s\n" "${version%%-*}" > "$codedir/.coreboot-version"
 
-	[ "${mode}" != "clean" ] && return 0
-	make -C "${codedir}" distclean 2>/dev/null || :
+	make $mode -j$(nproc) $makeargs -C "$codedir" || \
+	    err "run_make $codedir: !make $mode"
+
+	[ "$mode" != "clean" ] && return 0
+	make -C "$codedir" distclean 2>/dev/null || :
+}
+
+check_cmake()
+{
+	[ -z "${cmakedir}" ] || \
+		check_makefile "${1}" || \
+		    cmake -B "${1}" "${1}/${cmakedir}" || \
+		    check_makefile "${1}" || \
+		    err "check_cmake ${1}: can't cmake ${cmakedir}"
+	[ -z "${cmakedir}" ] || check_makefile "${1}" || \
+		err "check_cmake ${1}: could not generate Makefile"
+	return 0
+}
+
+check_autoconf()
+{
+	(
+	_cfgopt=""
+	cd "${1}" || err "!cd $1"
+	[ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs
+	[ -f "autogen.sh" ] && x_ ./autogen.sh ${autogenargs}
+	[ -f "configure" ] && x_ ./configure $autoconfargs; return 0
+	) || err "can't bootstrap project: $1"
+}
+
+check_makefile()
+{
+	[ -f "${1}/Makefile" ] || [ -f "${1}/makefile" ] || \
+	    [ -f "${1}/GNUmakefile" ] || return 1; return 0
 }
 
 copy_elf()
 {
-	while read f; do
+	while read -r f; do
 		[ ! -f "${codedir}/$f" ] || \
-			x_ cp "${codedir}/${f}" "${dest_dir}/"
-	done < ${listfile}
-
-	x_ make clean -C "${codedir}"
+			x_ cp "${codedir}/${f}" "$dest_dir"
+	done < "$listfile"
+	x_ make clean -C "$codedir"
 }
 
 main $@
diff --git a/util/dell-flash-unlock/README.md b/util/dell-flash-unlock/README.md
index ba45ddc..cbe33da 100644
--- a/util/dell-flash-unlock/README.md
+++ b/util/dell-flash-unlock/README.md
@@ -8,20 +8,31 @@ E6400, which mainly seem to be the Latitude and Precision lines starting from
 around 2008 (E6400 era).
 
 ## TL;DR
+On Linux, ensure you are booting with the `iomem=relaxed` kernel parameter.
+On OpenBSD, ensure you are booting with securelevel set to -1.
 Run `make` to compile the utility, and then run `sudo ./dell_flash_unlock` and
 follow the directions it outputs.
 
 ## Confirmed supported devices
-- Latitude E6400
-- Latitude E6410
-- Latitude E4310
-- Latitude E6430
+- Latitude E6400, E6500
+- Latitude E6410, E4310
+- Latitude E6420
+- Latitude E6430, E6530
 - Precision M6800
 
 It is likely that any other Latitude/Precision laptops from the same era as
 devices specifically mentioned in the above list will work as Dell seems to use
 the same ECs in one generation.
 
+## Tested
+These systems have been tested, but were reported as not working with
+dell-flash-unlock. This could be due to user error, a bug in this utility, or
+the feature not being implemented in Dell's firmware. If you have such a system,
+please test the utility and report whether or not it actually works for you.
+
+- Latitude E6220
+- Latitude E6330
+
 ## Detailed device specific behavior
 - On GM45 era laptops, the expected behavior is that you will run the utility
   for the first time, which will tell the EC to set the descriptor override on
@@ -100,3 +111,7 @@ There are other possible protection mechanisms that the firmware can utilize,
 such as Protected Range Register settings, which apply access permissions to
 address ranges of the flash, similar to the IFD. However, the E6400 vendor
 firmware does not utilize these, so they will not be discussed.
+
+## References
+- Open Security Training: Advanced x86: BIOS and SMM Internals - SMI Suppression
+  - https://opensecuritytraining.info/IntroBIOS_files/Day1_XX_Advanced%20x86%20-%20BIOS%20and%20SMM%20Internals%20-%20SMI%20Suppression.pdf