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

@@ -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}"
 }
 

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"

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"

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"

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"

config/coreboot/default/target.cfg

@@ -1,4 +1,3 @@
 tree="default"
-romtype="normal"
 rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
-arch="x86_64"
+xarch="i386-elf"

config/coreboot/dell/target.cfg

@@ -1,4 +1,3 @@
 tree="dell"
-romtype="normal"
 rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
-arch="x86_64"
+xarch="i386-elf"

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"

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"

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"

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

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

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

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"

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"

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
 
 #

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"

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
 
 #

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"

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
 
 #

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"

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
 
 #

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"

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

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

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
 
 #

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

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
 
 #

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

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
 
 #

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

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
 
 #

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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
 

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
 

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"

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
 

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
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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
 

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
 

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"

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
 

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
 

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"

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 \
 "

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
 "

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
+

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

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

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

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>

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' {

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 \

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;
  

config/grub/target.cfg

@@ -0,0 +1,3 @@
+bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
+autoconfargs="--with-platform=coreboot"
+makeargs="FS_PAYLOAD_MODULES=\"\""