experimental asus a88hm-e support

no auto-downloading or inserting of vga roms
and other files yet. i did this for someone one
irc who wanted an easier build

i deleted all other boards, just for this
branch. this branch *only* builds that one board.

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

.gitcheck

@@ -1,82 +0,0 @@
-#!/usr/bin/env sh
-# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
-# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
-# SPDX-License-Identifier: GPL-3.0-only
-
-git_name="lbmkplaceholder"
-git_email="placeholder@lbmkplaceholder.com"
-
-main()
-{
-	if [ $# -gt 0 ]; then
-		if [ "${1}" = "clean" ]; then
-			clean > /dev/null 2> /dev/null
-		else
-			printf "%s: Unsupported argument\n" $0
-			exit 1
-		fi
-	else
-		set_placeholders > /dev/null 2> /dev/null
-	fi
-}
-
-set_placeholders()
-{
-	set_git_credentials
-
-	# Check coreboot as well to prevent errors during building
-	if [ ! -d coreboot ]; then
-		return
-	fi
-	for x in coreboot/*; do
-		if [ ! -d "${x}" ]; then
-			continue
-		fi
-		(
-		cd "${x}"
-		set_git_credentials
-		)
-	done
-}
-
-set_git_credentials()
-{
-	# Check if username and or email is set.
-	if ! git config user.name || git config user.email ; then
-		git config user.name \
-				|| git config user.name "${git_name}"
-		git config user.email \
-				|| git config user.email "${git_email}"
-	fi
-}
-
-clean()
-{
-	unset_placeholders
-
-	if [ ! -d coreboot ]; then
-		return
-	fi
-	for x in coreboot/*; do
-		if [ ! -d "${x}" ]; then
-			continue
-		fi
-		(
-		cd "${x}"
-		unset_placeholders
-		)
-	done
-}
-
-unset_placeholders()
-{
-	if [ "$(git config user.name)" = "${git_name}" ]; then
-		git config --unset user.name
-	fi
-
-	if [ "$(git config user.email)" = "${git_email}" ]; then
-		git config --unset user.email
-	fi
-}
-
-main $@

.gitignore

@@ -1,20 +1,14 @@
 *~
 *.o
 /lbmk.err.log
+/docs/
 /cbutils/
 /pciroms/
-/util/e6400-flash-unlock/e6400_flash_unlock
-/util/ich9utils/*.bin
-/util/ich9utils/demefactory
-/util/ich9utils/ich9deblob
-/util/ich9utils/ich9show
-/util/ich9utils/ich9gen
+/util/dell-flash-unlock/dell_flash_unlock
 /TODO
-/bios_extract/
 /ec/
 /tmp/
-/payload/
-/me_cleaner/
+/elf/
 *.s[a-w]?
 *.vim
 /*.elf
@@ -22,26 +16,16 @@
 /*.rom
 /build_error
 /TODO/
-/docs/version
-/bucts/
-/coreboot/
-/crossgcc/
-/depthcharge/
-/flashrom/
-/resources/coreboot/*/seen
-/grub/
-/memtest86plus/
-/seabios/
-/u-boot/
+/config/*/*/seen
 /bin/
 /release/
-/descriptors/
 /*.bin
 /push
 /version
 /versiondate
-/blobs/app/
-/blobs/cache/
+/vendorfiles/
 *me.bin
+*sch5545ec.bin
 /mrc/
 /util/nvmutil/nvm
+/src/

Makefile

@@ -1,86 +0,0 @@
-# 
-# Makefile for meme purposes
-# You can use this, but it just runs lbmk commands.
-#
-# See docs/maintain/ and docs/git/ for information about the build system:
-# https://libreboot.org/docs/maintain/
-# https://libreboot.org/docs/build/
-#
-# Copyright (C) 2020, 2021, 2023 Leah Rowe <info@minifree.org>
-# Copyright (C) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-.POSIX:
-
-#.PHONY: all check download modules ich9m-descriptors payloads roms release \
-#	clean crossgcc-clean install-dependencies-ubuntu \
-#	install-dependencies-debian install-dependencies-arch \
-#	install-dependencies-void install-dependencies-fedora38 \
-#	install-dependencies-parabola
-
-all: roms
-
-download:
-	./download all
-
-modules:
-	./build module all
-
-ich9m-descriptors:
-	./build descriptors ich9m
-
-payloads:
-	./build payload all
-
-roms:
-	./build boot roms all
-
-release:
-	./build release src
-	./build release roms
-
-clean:
-	./build clean cbutils
-	./build clean flashrom
-	./build clean ich9utils
-	./build clean payloads
-	./build clean seabios
-	./build clean grub
-	./build clean memtest86plus
-	./build clean rom_images
-	./build clean u-boot
-	./build clean bios_extract
-
-crossgcc-clean:
-	./build clean crossgcc
-
-install-dependencies-ubuntu:
-	./build dependencies ubuntu2004
-
-install-dependencies-debian:
-	./build dependencies debian
-
-install-dependencies-arch:
-	./build dependencies arch
-
-install-dependencies-void:
-	./build dependencies void
-
-install-dependencies-fedora38:
-	./build dependencies fedora38
-
-install-dependencies-parabola:
-	./build dependencies parabola

README.md

@@ -28,7 +28,7 @@ Your freedom matters.
 Many people use proprietary (non-libre)
 boot firmware, even if they use [a libre OS](https://www.openbsd.org/).
 Proprietary firmware often contains backdoors (more info on the FAQ), and it
-and can be buggy. The libreboot project was founded in in December 2013,
+and can be buggy. The libreboot project was founded in December 2013,
 with the express purpose of making coreboot firmware accessible for
 non-technical users.
 
@@ -111,7 +111,7 @@ written in Markdown and hosted in a [separate
 repository](https://codeberg.org/libreboot/lbwww) where you can send patches.
 
 Any and all development discussion and user support are all done on the IRC
-channel. More information is on the contact page of libreboot.org.
+channel. More information is on https://libreboot.org/contact.html.
 
 LICENSE FOR THIS README
 =======================

blobutil

@@ -1 +0,0 @@
-lbmk

build

@@ -1 +0,0 @@
-lbmk

build

@@ -0,0 +1,165 @@
+#!/usr/bin/env sh
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014,2015,2020,2021,2023 Leah Rowe <leah@libreboot.org>
+# SPDX-FileCopyrightText: 2015 Patrick "P. J." McDermott <pj@pehjota.net>
+# 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
+export LC_ALL=C
+
+. "include/err.sh"
+. "include/option.sh"
+
+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}" = "lbmk" ]; then
+		tmpdir=""
+		tmpdir_was_set="n"
+	fi
+fi
+if [ "${tmpdir_was_set}" = "n" ]; then
+	export TMPDIR="/tmp"
+	tmpdir="$(mktemp -d -t lbmk_XXXXXXXX)"
+	export TMPDIR="${tmpdir}"
+else
+	export TMPDIR="${TMPDIR}"
+fi
+tmpdir="${TMPDIR}"
+
+linkpath="${0}"
+linkname="${linkpath##*/}"
+buildpath="./script/${linkname}"
+
+main()
+{
+	xx_ id -u 1>/dev/null 2>/dev/null
+	[ $# -lt 1 ] && fail "Too few arguments. Try: ${0} help"
+	if [ "${1}" = "dependencies" ]; then
+		xx_ install_packages $@
+		lbmk_exit 0
+	fi
+
+	initialise_command $@ && shift 1
+
+	check_git
+	check_project "fail"
+	git_init
+
+	execute_command $@
+	lbmk_exit 0
+}
+
+initialise_command()
+{
+	[ "$(id -u)" != "0" ] || fail "this command as root is not permitted"
+
+	check_project
+
+	case "${1}" in
+	help)
+		usage ${0}
+		lbmk_exit 0 ;;
+	list)
+		items "${buildpath}"
+		lbmk_exit 0 ;;
+	version)
+		mkversion
+		lbmk_exit 0 ;;
+	esac
+	option="${1}"
+}
+
+install_packages()
+{
+	if [ $# -lt 2 ]; then
+		printf "You must specify a distro, namely:\n" 1>&2
+		printf "Look at files under config/dependencies/\n" 1>&2
+		printf "Example: ./build dependencies debian\n" 1>&2
+		fail "install_packages: target not specified"
+	fi
+
+	[ -f "config/dependencies/${2}" ] || fail "Unsupported target"
+
+	. "config/dependencies/${2}"
+
+	xx_ ${pkg_add} ${pkglist}
+	[ -z "${aur_notice}" ] && return 0
+	printf "You must install AUR packages: %s\n" "${aur_notice}" 1>&2
+}
+
+# release archives contain .gitignore, but not .git.
+# lbmk can be run from lbmk.git, or an archive.
+git_init()
+{
+	[ -L ".git" ] && fail "Reference .git is a symlink"
+	[ -e ".git" ] && return 0
+	eval "$(setvars "$(date -Rd @${versiondate})" cdate _nogit)"
+
+	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}" \
+	    --author="lbmk <lbmk@libreboot.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()
+{
+	lbmkcmd="${buildpath}/${option}"
+	[ -f "${lbmkcmd}" ] || fail "Invalid command. Run: ${linkpath} help"
+	"${lbmkcmd}" $@ || fail "execute_command: ${lbmkcmd} ${@}"
+}
+
+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})"
+}
+
+lbmk_exit()
+{
+	tmp_cleanup || err "lbmk_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
+	err "${1}"
+}
+
+tmp_cleanup()
+{
+	[ "${tmpdir_was_set}" = "n" ] || return 0
+	rm -Rf "${tmpdir}" || return 1
+}
+
+main $@

config/coreboot/asus_a88hm_e/config/normal

@@ -19,8 +19,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y
 # CONFIG_UTIL_GENPARSER is not set
 CONFIG_OPTION_BACKEND_NONE=y
 # CONFIG_USE_OPTION_TABLE is not set
-CONFIG_COMPRESS_RAMSTAGE_LZMA=y
-# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set
+CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
@@ -31,8 +30,8 @@ CONFIG_USE_BLOBS=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
 # CONFIG_ASAN is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_TSEG_STAGE_CACHE=y
+CONFIG_NO_STAGE_CACHE=y
+# CONFIG_CBMEM_STAGE_CACHE is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 # CONFIG_FW_CONFIG is not set
@@ -56,28 +55,33 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
-CONFIG_VENDOR_APPLE=y
+# CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ASROCK is not set
-# CONFIG_VENDOR_ASUS is not set
+CONFIG_VENDOR_ASUS=y
+# CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BOSTENTECH is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_CLEVO is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_DELL is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_EXAMPLE is not set
 # CONFIG_VENDOR_FACEBOOK is not set
 # CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
+# CONFIG_VENDOR_GIZMOSPHERE is not set
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_INTEL is not set
+# CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LIBRETREND is not set
+# CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_OCP is not set
 # CONFIG_VENDOR_OPENCELLULAR is not set
@@ -92,6 +96,7 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
 # CONFIG_VENDOR_SAPPHIRE is not set
+# CONFIG_VENDOR_SCALEWAY is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SIFIVE is not set
 # CONFIG_VENDOR_STARLABS is not set
@@ -100,60 +105,97 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_UP is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
+CONFIG_MAINBOARD_PART_NUMBER="A88XM-E"
 CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
-CONFIG_VGA_BIOS_ID="8086,27a2"
+CONFIG_MAINBOARD_DIR="asus/a88xm-e"
+CONFIG_VGA_BIOS_ID="1002,9996"
 CONFIG_DIMM_MAX=4
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
-CONFIG_MAINBOARD_VENDOR="Apple"
-CONFIG_CBFS_SIZE=0x01000000
-CONFIG_MAX_CPUS=2
-# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_MAINBOARD_VENDOR="ASUS"
+CONFIG_CBFS_SIZE=0x00800000
+CONFIG_CONSOLE_SERIAL=y
+CONFIG_MAX_CPUS=4
+CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_POST_DEVICE=y
 CONFIG_POST_IO=y
-CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_EFS_SPI_READ_MODE=2
+CONFIG_EFS_SPI_SPEED=1
+CONFIG_EFS_SPI_MICRON_FLAG=0
+CONFIG_NORMAL_READ_SPI_SPEED=1
+CONFIG_ALT_SPI_SPEED=1
+CONFIG_TPM_SPI_SPEED=1
 # CONFIG_VBOOT is not set
+CONFIG_IRQ_SLOT_COUNT=11
+CONFIG_HW_MEM_HOLE_SIZEK=0x200000
+CONFIG_DEVICETREE="devicetree.cb"
+# CONFIG_HUDSON_LEGACY_FREE is not set
 CONFIG_OVERRIDE_DEVICETREE=""
-# CONFIG_VGA_BIOS is not set
-CONFIG_BOARD_APPLE_MACBOOK21=y
-# CONFIG_BOARD_APPLE_MACBOOK11 is not set
-# CONFIG_BOARD_APPLE_IMAC52 is not set
-# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
-CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
+CONFIG_VGA_BIOS=y
+CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_BOARD_ASUS_A88XM_E=y
+# CONFIG_BOARD_ASUS_AM1I_A is not set
+# CONFIG_BOARD_ASUS_F2A85_M is not set
+# CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
+# CONFIG_BOARD_ASUS_F2A85_M_LE is not set
+# CONFIG_BOARD_ASUS_H61M_CS is not set
+# CONFIG_BOARD_ASUS_P8H61_M_LX is not set
+# CONFIG_BOARD_ASUS_P8H61_M_LX3_R2_0 is not set
+# CONFIG_BOARD_ASUS_P8H61_M_PRO is not set
+# CONFIG_BOARD_ASUS_P8H61_M_PRO_CM6630 is not set
+# CONFIG_BOARD_ASUS_MAXIMUS_IV_GENE_Z is not set
+# CONFIG_BOARD_ASUS_P2B is not set
+# CONFIG_BOARD_ASUS_P2B_D is not set
+# CONFIG_BOARD_ASUS_P2B_DS is not set
+# CONFIG_BOARD_ASUS_P2B_F is not set
+# CONFIG_BOARD_ASUS_P2B_LS is not set
+# CONFIG_BOARD_ASUS_P3B_F is not set
+# CONFIG_BOARD_ASUS_P5GC_MX is not set
+# CONFIG_BOARD_ASUS_P5QC is not set
+# CONFIG_BOARD_ASUS_P5Q_PRO is not set
+# CONFIG_BOARD_ASUS_P5QL_PRO is not set
+# CONFIG_BOARD_ASUS_P5Q_SE is not set
+# CONFIG_BOARD_ASUS_P5Q is not set
+# CONFIG_BOARD_ASUS_P5QL_EM is not set
+# CONFIG_BOARD_ASUS_P5QPL_AM is not set
+# CONFIG_BOARD_ASUS_P5G41T_M_LX is not set
+# CONFIG_BOARD_ASUS_P8C_WS is not set
+# CONFIG_BOARD_ASUS_P8H77_V is not set
+# CONFIG_BOARD_ASUS_P8Z77_M_PRO is not set
+# CONFIG_BOARD_ASUS_P8Z77_V_LX2 is not set
+# CONFIG_BOARD_ASUS_P8Z77_V is not set
+# CONFIG_BOARD_ASUS_P8Z77_M is not set
+# CONFIG_HUDSON_XHCI_FWM is not set
+# CONFIG_HUDSON_XHCI_ENABLE is not set
 CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 # CONFIG_CONSOLE_POST is not set
 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
-CONFIG_DCACHE_RAM_BASE=0xfefc0000
-CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_DCACHE_RAM_BASE=0x30000
+CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
-CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xF8000000
 CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
+CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
-CONFIG_PCIEXP_HOTPLUG_BUSES=8
-CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_VGA_BIOS_FILE="../../../pciroms/pci1002,9996.rom"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="A88XM-E"
 CONFIG_PS2K_EISAID="PNP0303"
 CONFIG_PS2M_EISAID="PNP0F13"
-# CONFIG_DEBUG_SMI is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_HEAP_SIZE=0xc0000
 CONFIG_EC_GPE_SCI=0x50
-CONFIG_BOARD_ROMSIZE_KB_2048=y
+CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
@@ -161,24 +203,16 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x01000000
-CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
-CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
-CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
-# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
-# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
-CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+CONFIG_COREBOOT_ROMSIZE_KB=8192
+CONFIG_ROM_SIZE=0x00800000
 # end of Mainboard
 
-CONFIG_SYSTEM_TYPE_LAPTOP=y
-
 #
 # Chipset
 #
@@ -186,14 +220,16 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_ARCH_ALL_STAGES_X86=y
 CONFIG_CHIPSET_DEVICETREE=""
 CONFIG_CBFS_MCACHE_SIZE=0x4000
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
-CONFIG_SMM_RESERVED_SIZE=0x100000
-CONFIG_SMM_MODULE_STACK_SIZE=0x400
-CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X"
+# CONFIG_VGA_BIOS_SECOND is not set
+CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
+CONFIG_BOTTOMIO_POSITION=0x80000000
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_AHCI_ROM_ID="1022,7801"
 CONFIG_STACK_SIZE=0x2000
 CONFIG_VBT_DATA_SIZE_KB=8
 CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -201,98 +237,98 @@ CONFIG_INTEL_GMA_BCLV_WIDTH=16
 CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_BOOTBLOCK_IN_CBFS=y
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
-CONFIG_FIXED_SMBUS_IO_BASE=0x400
-CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_TTYS0_BASE=0x3f8
+CONFIG_TTYS0_LCS=3
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_SOC_AMD_COMMON=y
+CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO=y
+CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO_BIOSRAM=y
 CONFIG_CBFS_CACHE_ALIGN=8
-CONFIG_INTEL_HAS_TOP_SWAP=y
-# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
-CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
+CONFIG_SOC_AMD_COMMON_BLOCK_PCI_MMCONF=y
+# CONFIG_SOC_AMD_COMMON_BLOCK_SPI_DEBUG is not set
 
 #
 # CPU
 #
-CONFIG_CPU_INTEL_MODEL_6EX=y
-CONFIG_CPU_INTEL_MODEL_6FX=y
-CONFIG_SOCKET_SPECIFIC_OPTIONS=y
-CONFIG_CPU_INTEL_SOCKET_M=y
-CONFIG_CPU_INTEL_COMMON=y
-CONFIG_ENABLE_VMX=y
-CONFIG_SET_IA32_FC_LOCK_BIT=y
-CONFIG_SET_MSR_AESNI_LOCK_BIT=y
-CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
-CONFIG_CPU_INTEL_COMMON_SMM=y
-CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-CONFIG_PARALLEL_MP=y
-CONFIG_XAPIC_ONLY=y
-# CONFIG_X2APIC_ONLY is not set
-# CONFIG_X2APIC_RUNTIME is not set
-# CONFIG_X2APIC_LATE_WORKAROUND is not set
-CONFIG_UDELAY_TSC=y
-CONFIG_TSC_MONOTONIC_TIMER=y
-CONFIG_TSC_SYNC_MFENCE=y
-CONFIG_SETUP_XIP_CACHE=y
-CONFIG_LOGICAL_CPUS=y
-CONFIG_HAVE_SMI_HANDLER=y
-CONFIG_SMM_TSEG=y
-CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
-CONFIG_AP_STACK_SIZE=0x800
-CONFIG_SMP=y
-CONFIG_MMX=y
-CONFIG_SSE=y
+CONFIG_CPU_AMD_AGESA=y
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+# CONFIG_ENABLE_MRC_CACHE is not set
+CONFIG_CPU_AMD_AGESA_FAMILY15_TN=y
 CONFIG_SSE2=y
-CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
-CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
-# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
-# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
-# CONFIG_CPU_MICROCODE_CBFS_NONE is not set
+CONFIG_LEGACY_SMP_INIT=y
+CONFIG_XAPIC_ONLY=y
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+CONFIG_UNKNOWN_TSC_RATE=y
+CONFIG_TSC_SYNC_LFENCE=y
+CONFIG_LOGICAL_CPUS=y
+CONFIG_SMM_ASEG=y
+CONFIG_X86_AMD_FIXED_MTRRS=y
+CONFIG_SMP=y
+CONFIG_SSE=y
 
 #
 # Northbridge
 #
-CONFIG_NORTHBRIDGE_INTEL_I945=y
-CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
+CONFIG_NORTHBRIDGE_AMD_AGESA=y
+CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15_TN=y
 
 #
 # Southbridge
 #
-CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-CONFIG_INTEL_CHIPSET_LOCKDOWN=y
-CONFIG_TCO_SPACE_NOT_YET_SPLIT=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
+CONFIG_SOUTHBRIDGE_AMD_AGESA_HUDSON=y
+CONFIG_SOUTHBRIDGE_SPECIFIC_OPTIONS=y
+CONFIG_HUDSON_SATA_MODE=2
+
+#
+# AHCI
+#
+# CONFIG_HUDSON_AHCI_ROM is not set
+CONFIG_ACPI_ENABLE_THERMAL_ZONE=y
+# CONFIG_PCIEXP_HOTPLUG is not set
 CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
 CONFIG_RCBA_LENGTH=0x4000
 
 #
 # Super I/O
 #
+CONFIG_SUPERIO_ITE_COMMON_PRE_RAM=y
+CONFIG_SUPERIO_ITE_ENV_CTRL=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_8BIT_PWM=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_PWM_FREQ2=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_5FANS=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_7BIT_SLOPE_REG=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_EXT_ANY_TMPIN=y
+CONFIG_SUPERIO_ITE_IT8728F=y
 
 #
 # Embedded Controllers
 #
-CONFIG_EC_ACPI=y
+
+#
+# AMD Platform Initialization
+#
+# CONFIG_CPU_AMD_AGESA_BINARY_PI is not set
+CONFIG_CPU_AMD_AGESA_OPENSOURCE=y
+CONFIG_IDS_OPTIONS_HOOKED_UP=y
+CONFIG_IDS_ENABLED=y
+
+#
+# Warning: IDS options may not work. Enable at your own risk!
+#
+# CONFIG_IDS_CONTROL_ENABLED is not set
+# CONFIG_IDS_PERF_ANALYSIS is not set
+# CONFIG_IDS_TRACING_ENABLED is not set
+CONFIG_CPU_AMD_AGESA_OPENSOURCE_MEM_JEDEC=y
+# CONFIG_CPU_AMD_AGESA_OPENSOURCE_MEM_XMP_1 is not set
+# CONFIG_CPU_AMD_AGESA_OPENSOURCE_MEM_XMP_2 is not set
+# CONFIG_CPU_AMD_AGESA_OPENSOURCE_MEM_CUSTOM is not set
+# CONFIG_AGESA_EXTRA_TIMESTAMPS is not set
+# end of AMD Platform Initialization
+
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -300,15 +336,15 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_POSTCAR_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_ARCH_ALL_STAGES_X86_32=y
-CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_NUM_IPI_STARTS=2
 CONFIG_PC80_SYSTEM=y
-CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_POSTCAR_STAGE=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 CONFIG_HAVE_CF9_RESET=y
+CONFIG_HAVE_CF9_RESET_PREPARE=y
 CONFIG_DEBUG_HW_BREAKPOINTS=y
 CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
 # end of Chipset
@@ -316,28 +352,13 @@ CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
 #
 # Devices
 #
-CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_VGA_ROM_RUN_DEFAULT=y
 # CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
-CONFIG_NO_EARLY_GFX_INIT=y
-
-#
-# Display
-#
-# CONFIG_VGA_TEXT_FRAMEBUFFER is not set
-CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
-CONFIG_LINEAR_FRAMEBUFFER=y
-# CONFIG_BOOTSPLASH is not set
-# end of Display
-
+CONFIG_NO_GFX_INIT=y
 CONFIG_PCI=y
 CONFIG_ECAM_MMCONF_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
-CONFIG_AZALIA_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_ECAM_MMCONF_LENGTH=0x04000000
 CONFIG_PCI_ALLOW_BUS_MASTER=y
@@ -345,23 +366,13 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
 CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
 # CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
 # CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
-# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
-CONFIG_PCIEXP_HOTPLUG_IO=0x2000
-CONFIG_FIRMWARE_CONNECTION_MANAGER=y
-# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-# CONFIG_INTEL_GMA_ADD_VBT is not set
+# CONFIG_VGA_BIOS_DGPU is not set
 # CONFIG_SOFTWARE_I2C is not set
 CONFIG_I2C_TRANSFER_TIMEOUT_US=500000
-# CONFIG_RESOURCE_ALLOCATION_TOP_DOWN is not set
-CONFIG_NO_DDR5=y
-CONFIG_NO_LPDDR4=y
-CONFIG_NO_DDR4=y
-CONFIG_NO_DDR3=y
-CONFIG_USE_DDR2=y
+CONFIG_RESOURCE_ALLOCATOR_V3=y
 # end of Devices
 
 #
@@ -369,7 +380,8 @@ CONFIG_USE_DDR2=y
 #
 CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_ELOG is not set
-# CONFIG_SMMSTORE is not set
+CONFIG_CACHE_MRC_SETTINGS=y
+# CONFIG_MRC_SETTINGS_PROTECT is not set
 CONFIG_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
@@ -383,28 +395,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
+CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
+CONFIG_DRIVERS_AMD_PI=y
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
 # CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
 # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
 # CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
 # CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_EDID=y
-CONFIG_INTEL_INT15=y
-CONFIG_INTEL_GMA_ACPI=y
-CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 CONFIG_INTEL_GMA_OPREGION_2_0=y
 # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
 CONFIG_USE_PC_CMOS_ALTCENTURY=y
-CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
@@ -435,16 +445,12 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
 # end of Memory initialization
 
-# CONFIG_STM is not set
 CONFIG_BOOTMEDIA_LOCK_NONE=y
 # CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
 # CONFIG_BOOTMEDIA_LOCK_CHIP is not set
-# CONFIG_BOOTMEDIA_SMM_BWP is not set
 # end of Security
 
 CONFIG_ACPI_HAVE_PCAT_8259=y
-CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
-CONFIG_ACPI_SOC_NVS=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
@@ -456,12 +462,27 @@ CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+
+#
+# I/O mapped, 8250-compatible
+#
+
+#
+# Serial port base address = 0x3f8
+#
+# CONFIG_CONSOLE_SERIAL_921600 is not set
+# CONFIG_CONSOLE_SERIAL_460800 is not set
+# CONFIG_CONSOLE_SERIAL_230400 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
-# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
-# CONFIG_CONSOLE_I2C_SMBUS is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -487,13 +508,15 @@ CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_MONOTONIC_TIMER=y
 CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_IOAPIC=y
-CONFIG_USE_WATCHDOG_ON_BOOT=y
+CONFIG_GFXUMA=y
 CONFIG_HAVE_MP_TABLE=y
+CONFIG_HAVE_PIRQ_TABLE=y
 
 #
 # System tables
 #
 CONFIG_GENERATE_MP_TABLE=y
+CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 # end of System tables
@@ -502,6 +525,32 @@ CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 # Payload
 #
 CONFIG_PAYLOAD_NONE=y
+# CONFIG_PAYLOAD_ELF is not set
+# CONFIG_PAYLOAD_BOOTBOOT is not set
+# CONFIG_PAYLOAD_FILO is not set
+# CONFIG_PAYLOAD_GRUB2 is not set
+# CONFIG_PAYLOAD_SEAGRUB is not set
+# CONFIG_PAYLOAD_LINUXBOOT is not set
+# CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_UBOOT is not set
+# CONFIG_PAYLOAD_YABITS is not set
+# CONFIG_PAYLOAD_EDK2 is not set
+# CONFIG_PAYLOAD_LINUX is not set
+CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
+# CONFIG_COMPRESS_SECONDARY_PAYLOAD is not set
+
+#
+# Secondary Payloads
+#
+# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set
+# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_SEABIOS_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# CONFIG_COREDOOM_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
 # end of Payload
 
 #
@@ -520,12 +569,10 @@ CONFIG_PAYLOAD_NONE=y
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
-CONFIG_HAVE_DEBUG_RAM_SETUP=y
-# CONFIG_DEBUG_RAM_SETUP is not set
-CONFIG_HAVE_DEBUG_SMBUS=y
-# CONFIG_DEBUG_SMBUS is not set
+# CONFIG_DEBUG_PIRQ is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set

config/coreboot/asus_a88hm_e/target.cfg

@@ -1,9 +1,8 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
 payload_seabios="y"
+payload_seabios_withgrub="y"
+payload_seabios_grubonly="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-microcode_required="n"

config/coreboot/build.list

@@ -0,0 +1 @@
+build/coreboot.rom

config/coreboot/default/target.cfg

@@ -0,0 +1,4 @@
+tree="default"
+romtype="normal"
+rev="54d0cc9a3cf31963ebf0ca85a87a7e464ef678a7" # 4.18_branch
+arch="x86_64"

config/dependencies/arch

@@ -0,0 +1,11 @@
+pkg_add="pacman -S --needed --noconfirm"
+pkglist=" \
+acpica arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
+autogen base-devel bison cmake curl device-mapper doxygen \
+dtc e2fsprogs flex freetype2 fuse2 gawk gcc-ada gdb gettext git \
+help2man innoextract libftdi libpciaccess libusb nasm ncurses openssl p7zip \
+parted pciutils perl perl-libwww python python-setuptools rsync sharutils \
+subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib \
+"
+
+aur_notice="bdf-unifont unifont"

config/dependencies/debian

@@ -0,0 +1,15 @@
+pkg_add="apt-get -y install"
+pkglist=" \
+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 \
+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 \
+"

config/dependencies/fedora38

@@ -0,0 +1,12 @@
+pkg_add="dnf -y install"
+pkglist=" \
+acpica-tools arm-none-eabi-binutils arm-none-eabi-gcc \
+arm-none-eabi-gcc arm-none-eabi-newlib autogen bison bzip2 cmake curl \
+dejavu-fonts-all device-mapper doxygen e2fsprogs flex freetype-devel fuse \
+gawk gcc gcc-gnat gdb gettext gettext-devel git gprbuild help2man \
+innoextract intltool libftdi-devel libselinux-devel libusb1 libusb1-devel \
+nasm ncurses-devel openssl-devel p7zip p7zip-plugins pandoc parted \
+pciutils-devel perl perl-libwww-perl python-unversioned-command python3 \
+python3-setuptools rsync sharutils subversion texinfo unar unifont \
+unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel \
+"

config/dependencies/mint

@@ -0,0 +1 @@
+debian

config/dependencies/parabola

@@ -0,0 +1,10 @@
+pkg_add="pacman -S --needed --noconfirm"
+pkglist=" \
+acpica arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
+autogen base-devel bdf-unifont bison cmake curl device-mapper doxygen \
+dtc e2fsprogs flex freetype2 fuse2 gawk gcc-ada gdb gettext git \
+help2man innoextract libftdi libpciaccess libusb nasm ncurses openssl p7zip \
+parted pciutils perl perl-libwww python python-setuptools rsync sharutils \
+subversion swig texinfo ttf-dejavu unarchiver unifont-utils unzip wget xz \
+zlib \
+"

config/dependencies/popos

@@ -0,0 +1 @@
+debian

config/dependencies/trisquel

@@ -0,0 +1 @@
+ubuntu2004

config/dependencies/ubuntu

@@ -0,0 +1 @@
+debian

config/dependencies/ubuntu2004

@@ -0,0 +1,14 @@
+pkg_add="apt-get -y install"
+pkglist=" \
+autoconf autogen automake autopoint autotools-dev bc binutils-arm-none-eabi \
+bison build-essential cmake curl device-tree-compiler doxygen e2fsprogs efitools \
+flex 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 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-0 \
+libusb-1.0-0-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 ttf-unifont unar unifont unzip uuid-dev wget zlib1g-dev \
+"

config/dependencies/void

@@ -0,0 +1,11 @@
+pkg_add="xbps-install -y"
+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 \
+"

config/git/bios_extract

@@ -0,0 +1,6 @@
+{bios_extract}{
+	rev: 0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0
+	loc: bios_extract
+	url: https://review.coreboot.org/bios_extract
+	bkup_url: https://github.com/coreboot/bios_extract/
+}

config/git/biosutilities

@@ -0,0 +1,6 @@
+{biosutilities}{
+	rev: 03ae0cf0706ede5a2a15da0986c19c776d0e6b26
+	loc: biosutilities
+	url: https://codeberg.org/libreboot/BIOSUtilities
+	bkup_url: https://github.com/platomav/BIOSUtilities
+}

config/git/coreboot

@@ -0,0 +1,6 @@
+{coreboot}{
+	rev: HEAD
+	loc: coreboot/coreboot
+	url: https://review.coreboot.org/coreboot
+	bkup_url: https://github.com/coreboot/coreboot.git
+}

config/git/docs

@@ -0,0 +1,30 @@
+{docs}{
+	rev: 06ac864b9a738b5daec3736ddb0fb2f94f127ee0
+	loc: docs
+	url: https://codeberg.org/vimuser/untitled
+	bkup_url: https://notabug.org/untitled/untitled
+	depend: mdfiles
+	depend: untitledwww
+}
+
+{mdfiles}{
+	rev: 6ebb88528e342cae48ee75a6f1bfa1b71002e1c3
+	loc: docs/www/html
+	url: https://codeberg.org/libreboot/lbwww
+	bkup_url: https://git.disroot.org/libreboot/lbwww
+	depend: imgfiles
+}
+
+{imgfiles}{
+	rev: 918c0ba07cf45f07836fa8c312fc51b48db32e0a
+	loc: docs/www/html/site/img
+	url: https://codeberg.org/libreboot/lbwww-img
+	bkup_url: https://git.disroot.org/libreboot/lbwww-img
+}
+
+{untitledwww}{
+	rev: 78cdadea40143a7e55b8eae48f4239d31ebb5c16
+	loc: docs/www/untitled
+	url: https://codeberg.org/vimuser/untitled-website
+	bkup_url: https://notabug.org/untitled/untitled-website
+}

config/git/flashrom

@@ -0,0 +1,6 @@
+{flashrom}{
+	rev: fba29da188b4a3aa8a3cf6f5a3d13c37a5d9e1d7
+	loc: flashrom 
+	url: https://review.coreboot.org/flashrom.git
+	bkup_url: https://github.com/flashrom/flashrom
+}

config/git/grub

@@ -0,0 +1,14 @@
+{grub}{
+	rev: 64e3cee72ab8f5876abfebb263b5e6cf7c4a9a4e
+	loc: grub
+	url: git://git.savannah.gnu.org/grub.git
+	bkup_url: https://codeberg.org/libreboot/grub
+	depend: gnulib
+}
+
+{gnulib}{
+	rev: 9f48fb992a3d7e96610c4ce8be969cff2d61a01b
+	loc: grub/gnulib
+	url: git://git.sv.gnu.org/gnulib
+	bkup_url: https://codeberg.org/libreboot/gnulib
+}

config/git/memtest86plus

@@ -0,0 +1,6 @@
+{memtest86plus}{
+	rev: 5dcd424ea7afb857c1171e747ef064d98d26afeb
+	loc: memtest86plus
+	url: https://codeberg.org/libreboot/memtest86plus
+	bkup_url: https://github.com/memtest86plus/memtest86plus.git
+}

config/git/pico-sdk

@@ -0,0 +1,6 @@
+{pico-sdk}{
+	rev: 6a7db34ff63345a7badec79ebea3aaef1712f374
+	loc: pico-sdk
+	url: https://codeberg.org/libreboot/pico-sdk
+	bkup_url: https://github.com/raspberrypi/pico-sdk
+}

config/git/pico-serprog

@@ -0,0 +1,7 @@
+{pico-serprog}{
+	rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9
+	loc: pico-serprog
+	url: https://codeberg.org/libreboot/pico-serprog
+	bkup_url: https://git.disroot.org/libreboot/pico-serprog
+	depend: pico-sdk
+}

config/git/seabios

@@ -0,0 +1,6 @@
+{seabios}{
+	rev: HEAD
+	loc: seabios/seabios
+	url: https://review.coreboot.org/seabios
+	bkup_url: https://github.com/coreboot/seabios
+}

config/git/stm32-vserprog

@@ -0,0 +1,6 @@
+{stm32-vserprog}{
+	rev: 8fcf0a4d41800631b571fa7bbd1d8b251f0a2111
+	loc: stm32-vserprog
+	url: https://codeberg.org/libreboot/stm32-vserprog
+	bkup_url: https://git.disroot.org/libreboot/stm32-vserprog
+}

config/git/u-boot

@@ -0,0 +1,6 @@
+{u-boot}{
+	rev: HEAD
+	loc: u-boot/u-boot
+	url: https://source.denx.de/u-boot/u-boot.git
+	bkup_url: https://github.com/u-boot/u-boot.git
+}

config/git/uefitool

@@ -0,0 +1,6 @@
+{uefitool}{
+	rev: 4a41c33596e9bc3ae812e763965d91ac57553e02
+	loc: uefitool
+	url: https://codeberg.org/libreboot/UEFITool
+	bkup_url: https://github.com/LongSoft/UEFITool
+}

config/grub/config/AUTHORS

@@ -0,0 +1,2 @@
+Copyright (C) 2014, 2015, 2016, 2020, 2021, 2023 Leah Rowe <leah@libreboot.org>
+Copyright (C) 2015 Klemens Nanni <contact@autoboot.org>

config/grub/config/grub.cfg

@@ -26,11 +26,24 @@ elif [ -f (cbfsdisk)/background.jpg ]; then
 fi
 
 set default="0"
-set timeout=30
-set pager=1
+if [ -f (cbfsdisk)/timeout.cfg ]; then
+	source (cbfsdisk)/timeout.cfg
+else	
+	set timeout=5
+fi
 set grub_scan_disk="both"
+if [ -f (cbfsdisk)/scan.cfg ]; then
+	source (cbfsdisk)/scan.cfg
+fi
+
+if [ -f (cbfsdisk)/keymap.gkb ]; then
+	keymap (cbfsdisk)/keymap.gkb
+elif [ -f (cbfsdisk)/keymap.cfg ]; then
+	source (cbfsdisk)/keymap.cfg
+else
+	keymap usqwerty
+fi
 
-keymap usqwerty
 function try_user_config {
 	set root="${1}"
 	for dir in boot grub grub2 boot/grub boot/grub2; do
@@ -88,7 +101,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 
 	# TODO: add more strings, based on what distros set up when
 	# the user select auto-partitioning on those installers
-	lvmvol="lvm/matrix-bootvol lvm/matrix-rootvol"
+	lvmvol="lvm/grubcrypt-bootvol lvm/grubcrypt-rootvol"
 
 	raidvol="md/0 md/1 md/2 md/3 md/4 md/5 md/6 md/7 md/8 md/9"
 
@@ -156,24 +169,26 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 	true # Prevent pager requiring to accept each line instead of whole screen
 }
 
-menuentry 'Search ISOLINUX menu (AHCI)  [a]' --hotkey='a' {
-	search_isolinux ahci
+menuentry 'Find and load GRUB config from USB drive  [s]' --hotkey='s' {
+	search_grub usb
 }
-menuentry 'Search ISOLINUX menu (USB)  [u]' --hotkey='u' {
+menuentry 'Find and load ISOLINUX/EXTLINUX from USB drive  [u]' --hotkey='u' {
 	search_isolinux usb
 }
-menuentry 'Search ISOLINUX menu (ATA/IDE)  [d]' --hotkey='d' {
+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
 }
+if [ -f (cbfsdisk)/grubtest.cfg ]; then
 menuentry 'Load test configuration (grubtest.cfg) inside of CBFS  [t]' --hotkey='t' {
 	set root='(cbfsdisk)'
 	if [ -f /grubtest.cfg ]; then
 		configfile /grubtest.cfg
 	fi
 }
-menuentry 'Search for GRUB2 configuration on external media  [s]' --hotkey='s' {
-	search_grub usb
-}
+fi
 if [ -f (cbfsdisk)/seabios.elf ]; then
 menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' {
 	set root='cbfsdisk'

config/grub/config/grub_memdisk.cfg

@@ -0,0 +1,7 @@
+set prefix=(memdisk)/boot/grub
+
+if [ -f (cbfsdisk)/grub.cfg ]; then
+	source (cbfsdisk)/grub.cfg
+else
+	source (memdisk)/boot/grub/grub_default.cfg
+fi

config/grub/modules.list

@@ -1,99 +1,24 @@
 # Install modules (installed, but not automatically loaded)
 grub_install_modules=" \
-adler32 \
-backtrace \
-bfs \
-bswap_test \
-cmdline_cat_test \
-cmp_test \
-cpuid \
-ctz_test \
-div \
-div_test \
-dm_nv \
-exfctest \
-functional_test \
-gdb \
-geli \
-gettext \
-hello \
 hexdump \
-hfs \
-hfsplus \
-hfspluscomp \
-http \
-jfs \
-macbless \
-macho \
-mda_text \
-minix \
-minix2 \
-minix2_be \
-minix3 \
-minix3_be \
-minix_be \
-morse \
-mpi \
-mul_test \
-net \
 newc \
-nilfs2 \
 odc \
-offsetio \
-part_acorn \
-part_amiga \
-part_apple \
-part_dvh \
-part_plan \
-part_sun \
-part_sunpc \
-pbkdf2_test \
-rdmsr \
-reiserfs \
-setjmp_test \
-shift_test \
-signature_test \
-sleep_test \
-strtoull_test \
-test_blockarg \
-testload \
-testspeed \
-tftp \
-ufs1 \
-ufs1_be \
-ufs2 \
 usbserial_common \
 usbserial_ftdi \
 usbserial_pl2303 \
 usbserial_usbdebug \
-usbtest \
-video_bochs \
-video_cirrus \
 video_colors \
-videoinfo \
-videotest \
-videotest_checksum \
-wrmsr \
-xnu \
-xnu_uuid \
-xnu_uuid_test \
 "
 
 # Modules (and always loaded)
 grub_modules=" \
 acpi \
-affs \
-afs \
-afsplitter \
 ahci \
-aout \
 at_keyboard \
 all_video \
-archelp \
 ata \
 bitmap \
 bitmap_scale \
-blocklist \
 boot \
 bsd \
 btrfs \
@@ -103,33 +28,19 @@ cbls \
 cbmemc \
 cbtime \
 chain \
-cmosdump \
-cmostest \
-cmp \
 configfile \
 cpio \
 cpio_be \
 crc64 \
 crypto \
 cryptodisk \
-cs5536 \
-date \
-datehook \
-datetime \
-disk \
 diskfilter \
 echo \
-efiemu \
 ehci \
 eval \
 elf \
-extcmd \
-exfat \
 ext2 \
 f2fs \
-fat \
-file \
-fshelp \
 gcry_arcfour \
 gcry_blowfish \
 gcry_camellia \
@@ -152,23 +63,20 @@ gcry_sha512 \
 gcry_tiger \
 gcry_twofish \
 gcry_whirlpool \
+geli \
 gfxmenu \
 gfxterm_background \
 gfxterm_menu \
-gptsync \
 gzio \
-halt \
 hashsum \
-hdparm \
+halt \
 help \
 iorw \
 iso9660 \
-json \
 jpeg \
 json \
 keylayouts \
 keystatus \
-ldm \
 linux \
 linux16 \
 loadenv \
@@ -179,6 +87,7 @@ lsmmap \
 lspci \
 luks \
 luks2 \
+argon2 \
 lvm \
 lzopio \
 mdraid09 \
@@ -188,39 +97,29 @@ memdisk \
 memrw \
 minicmd \
 mmap \
-msdospart \
 multiboot \
 multiboot2 \
 nativedisk \
 normal \
-ntfs \
-ntfscomp \
 ohci \
 part_bsd \
 part_dfly \
 part_gpt \
 part_msdos \
-parttool \
 password \
 password_pbkdf2 \
 pata \
 pbkdf2 \
-pci \
 pcidump \
 pgp \
 play \
 png \
-priority_queue \
-probe \
 procfs \
-progress \
 raid5rec \
 raid6rec \
-random \
 read \
 reboot \
 regexp \
-relocator \
 romfs \
 scsi \
 search \
@@ -231,22 +130,17 @@ serial \
 syslinuxcfg \
 setjmp \
 setpci \
-sleep \
-smbios \
 spkmodem \
 squash4 \
-sfs \
+sleep \
 tar \
-terminal \
-terminfo \
 test \
-time \
-tga \
 true \
-tr \
-trig \
-udf \
 uhci \
+udf \
+ufs1 \
+ufs1_be \
+ufs2 \
 usb \
 usb_keyboard \
 usbms \

config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch

@@ -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 (_("libreboot firmware, based on coreboot.    https://libreboot.org/"));
++  msg_formatted = grub_xasprintf (_("Libreboot 20231106 release, based on coreboot.    https://libreboot.org/"));
    if (!msg_formatted)
      return;
  

config/grub/patches/0002-luks2/0003-Add-CC0-license.patch

@@ -0,0 +1,42 @@
+From de6e7cc62522ce1be21bd2f06e7c15cd234b5426 Mon Sep 17 00:00:00 2001
+From: Ax333l <main@axelen.xyz>
+Date: Thu, 17 Aug 2023 00:00:00 +0000
+Subject: [PATCH 1/6] Add CC0 license
+
+Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
+---
+ grub-core/kern/dl.c           | 3 ++-
+ util/grub-module-verifierXX.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 0bf40caa6..4011e2d15 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -470,7 +470,8 @@ grub_dl_check_license (grub_dl_t mod, Elf_Ehdr *e)
+ 
+   if (grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3") == 0
+       || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3+") == 0
+-      || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0)
++      || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0
++      || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=CC0") == 0)
+     return GRUB_ERR_NONE;
+ 
+   return grub_error (GRUB_ERR_BAD_MODULE,
+diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
+index a42c20bd1..7157a30aa 100644
+--- a/util/grub-module-verifierXX.c
++++ b/util/grub-module-verifierXX.c
+@@ -236,7 +236,8 @@ check_license (const char * const filename,
+   Elf_Shdr *s = find_section (arch, e, ".module_license", module_size);
+   if (s && (strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv3") == 0
+ 	    || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv3+") == 0
+-	    || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv2+") == 0))
++	    || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv2+") == 0
++	    || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=CC0") == 0))
+     return;
+   grub_util_error ("%s: incompatible license", filename);
+ }
+-- 
+2.39.2
+

config/grub/patches/0002-luks2/0004-Define-GRUB_UINT32_MAX.patch

@@ -0,0 +1,39 @@
+From 9edaaffac91d593a439e44bac3b6f5558f5a8245 Mon Sep 17 00:00:00 2001
+From: Ax333l <main@axelen.xyz>
+Date: Thu, 17 Aug 2023 00:00:00 +0000
+Subject: [PATCH 2/6] Define GRUB_UINT32_MAX
+
+Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
+---
+ include/grub/types.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/grub/types.h b/include/grub/types.h
+index 0d96006fe..a13f3a60b 100644
+--- a/include/grub/types.h
++++ b/include/grub/types.h
+@@ -156,6 +156,7 @@ typedef grub_int32_t	grub_ssize_t;
+ #define GRUB_SHRT_MAX 0x7fff
+ #define GRUB_SHRT_MIN (-GRUB_SHRT_MAX - 1)
+ #define GRUB_UINT_MAX 4294967295U
++#define GRUB_UINT32_MAX 4294967295U
+ #define GRUB_INT_MAX 0x7fffffff
+ #define GRUB_INT_MIN (-GRUB_INT_MAX - 1)
+ #define GRUB_INT32_MAX 2147483647
+@@ -177,6 +178,13 @@ typedef grub_int32_t	grub_ssize_t;
+ #define GRUB_TYPE_U_MAX(type) ((unsigned long long)((typeof (type))(~0)))
+ #define GRUB_TYPE_U_MIN(type) 0ULL
+ 
++# define GRUB_UINT32_C(x) x ## U
++# if GRUB_ULONG_MAX >> 31 >> 31 >> 1 == 1
++#  define GRUB_UINT64_C(x) x##UL
++# elif 1
++#  define GRUB_UINT64_C(x) x##ULL
++# endif
++
+ typedef grub_uint64_t grub_properly_aligned_t;
+ 
+ #define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properly_aligned_t)]
+-- 
+2.39.2
+

config/grub/patches/0002-luks2/0006-Error-on-missing-Argon2id-parameters.patch

@@ -0,0 +1,58 @@
+From 0044d32121bf52c4547c6b3c78f12d7305f57e6b Mon Sep 17 00:00:00 2001
+From: Ax333l <main@axelen.xyz>
+Date: Thu, 17 Aug 2023 00:00:00 +0000
+Subject: [PATCH 4/6] Error on missing Argon2id parameters
+
+Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
+---
+ grub-core/disk/luks2.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
+index d5106402f..bc818ea69 100644
+--- a/grub-core/disk/luks2.c
++++ b/grub-core/disk/luks2.c
+@@ -38,6 +38,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ enum grub_luks2_kdf_type
+ {
+   LUKS2_KDF_TYPE_ARGON2I,
++  LUKS2_KDF_TYPE_ARGON2ID,
+   LUKS2_KDF_TYPE_PBKDF2
+ };
+ typedef enum grub_luks2_kdf_type grub_luks2_kdf_type_t;
+@@ -90,7 +91,7 @@ struct grub_luks2_keyslot
+ 	grub_int64_t time;
+ 	grub_int64_t memory;
+ 	grub_int64_t cpus;
+-      } argon2i;
++      } argon2;
+       struct
+       {
+ 	const char   *hash;
+@@ -160,10 +161,11 @@ luks2_parse_keyslot (grub_luks2_keyslot_t *out, const grub_json_t *keyslot)
+     return grub_error (GRUB_ERR_BAD_ARGUMENT, "Missing or invalid KDF");
+   else if (!grub_strcmp (type, "argon2i") || !grub_strcmp (type, "argon2id"))
+     {
+-      out->kdf.type = LUKS2_KDF_TYPE_ARGON2I;
+-      if (grub_json_getint64 (&out->kdf.u.argon2i.time, &kdf, "time") ||
+-	  grub_json_getint64 (&out->kdf.u.argon2i.memory, &kdf, "memory") ||
+-	  grub_json_getint64 (&out->kdf.u.argon2i.cpus, &kdf, "cpus"))
++      out->kdf.type = !grub_strcmp (type, "argon2i")
++		      ? LUKS2_KDF_TYPE_ARGON2I : LUKS2_KDF_TYPE_ARGON2ID;
++      if (grub_json_getint64 (&out->kdf.u.argon2.time, &kdf, "time") ||
++	  grub_json_getint64 (&out->kdf.u.argon2.memory, &kdf, "memory") ||
++	  grub_json_getint64 (&out->kdf.u.argon2.cpus, &kdf, "cpus"))
+ 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "Missing Argon2i parameters");
+     }
+   else if (!grub_strcmp (type, "pbkdf2"))
+@@ -459,6 +461,7 @@ luks2_decrypt_key (grub_uint8_t *out_key,
+   switch (k->kdf.type)
+     {
+       case LUKS2_KDF_TYPE_ARGON2I:
++      case LUKS2_KDF_TYPE_ARGON2ID:
+ 	ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Argon2 not supported");
+ 	goto err;
+       case LUKS2_KDF_TYPE_PBKDF2:
+-- 
+2.39.2
+

config/grub/patches/0002-luks2/0007-Compile-with-Argon2id-support.patch

@@ -0,0 +1,83 @@
+From 0a21695c55f76f1c958bb633481d55b3168562f7 Mon Sep 17 00:00:00 2001
+From: Ax333l <main@axelen.xyz>
+Date: Thu, 17 Aug 2023 00:00:00 +0000
+Subject: [PATCH 5/6] Compile with Argon2id support
+
+Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
+---
+ Makefile.util.def           |  6 +++++-
+ grub-core/Makefile.core.def |  2 +-
+ grub-core/disk/luks2.c      | 13 +++++++++++--
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.util.def b/Makefile.util.def
+index 1e9a13d3e..a167825c3 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -3,7 +3,7 @@ AutoGen definitions Makefile.tpl;
+ library = {
+   name = libgrubkern.a;
+   cflags = '$(CFLAGS_GNULIB)';
+-  cppflags = '$(CPPFLAGS_GNULIB) -I$(srcdir)/grub-core/lib/json';
++  cppflags = '$(CPPFLAGS_GNULIB) -I$(srcdir)/grub-core/lib/json -I$(srcdir)/grub-core/lib/argon2';
+ 
+   common = util/misc.c;
+   common = grub-core/kern/command.c;
+@@ -36,6 +36,10 @@ library = {
+   common = grub-core/kern/misc.c;
+   common = grub-core/kern/partition.c;
+   common = grub-core/lib/crypto.c;
++  common = grub-core/lib/argon2/argon2.c;
++  common = grub-core/lib/argon2/core.c;
++  common = grub-core/lib/argon2/ref.c;
++  common = grub-core/lib/argon2/blake2/blake2b.c;
+   common = grub-core/lib/json/json.c;
+   common = grub-core/disk/luks.c;
+   common = grub-core/disk/luks2.c;
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 4a06789e5..e939dcc99 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1238,7 +1238,7 @@ module = {
+   common = disk/luks2.c;
+   common = lib/gnulib/base64.c;
+   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+-  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/json';
++  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/json -I$(srcdir)/lib/argon2';
+ };
+ 
+ module = {
+diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
+index bc818ea69..5b9eaa599 100644
+--- a/grub-core/disk/luks2.c
++++ b/grub-core/disk/luks2.c
+@@ -27,6 +27,7 @@
+ #include <grub/partition.h>
+ #include <grub/i18n.h>
+ 
++#include <argon2.h>
+ #include <base64.h>
+ #include <json.h>
+ 
+@@ -462,8 +463,16 @@ luks2_decrypt_key (grub_uint8_t *out_key,
+     {
+       case LUKS2_KDF_TYPE_ARGON2I:
+       case LUKS2_KDF_TYPE_ARGON2ID:
+-	ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Argon2 not supported");
+-	goto err;
++	ret = argon2_hash (k->kdf.u.argon2.time, k->kdf.u.argon2.memory, k->kdf.u.argon2.cpus,
++			   passphrase, passphraselen, salt, saltlen, area_key, k->area.key_size,
++			   k->kdf.type == LUKS2_KDF_TYPE_ARGON2I ? Argon2_i : Argon2_id,
++			   ARGON2_VERSION_NUMBER);
++        if (ret)
++	  {
++	    grub_dprintf ("luks2", "Argon2 failed: %s\n", argon2_error_message (ret));
++	    goto err;
++	  }
++        break;
+       case LUKS2_KDF_TYPE_PBKDF2:
+ 	hash = grub_crypto_lookup_md_by_name (k->kdf.u.pbkdf2.hash);
+ 	if (!hash)
+-- 
+2.39.2
+

config/grub/patches/0002-luks2/0008-Make-grub-install-work-with-Argon2.patch

@@ -0,0 +1,26 @@
+From 6c9a6625c0dc038d1bdbdc13665f40e269e86496 Mon Sep 17 00:00:00 2001
+From: Ax333l <main@axelen.xyz>
+Date: Thu, 17 Aug 2023 00:00:00 +0000
+Subject: [PATCH 6/6] Make grub-install work with Argon2
+
+Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
+---
+ util/grub-install.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util/grub-install.c b/util/grub-install.c
+index 1ad04db36..a8a3330b8 100644
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -448,6 +448,8 @@ probe_mods (grub_disk_t disk)
+     {
+       grub_util_cryptodisk_get_abstraction (disk,
+ 					    push_cryptodisk_module, NULL);
++      /* HACK: always push argon2 */
++      grub_install_push_module ("argon2");
+       have_abstractions = 1;
+       have_cryptodisk = 1;
+     }
+-- 
+2.39.2
+

config/grub/patches/0003-keyboardfix/0001-at_keyboard-coreboot-force-scancodes2-translate.patch

@@ -0,0 +1,107 @@
+From 96c0bbe5d406b616360a7fce7cee67d7692c0d6d Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 30 Oct 2023 22:19:21 +0000
+Subject: [PATCH 1/1] at_keyboard coreboot: force scancodes2+translate
+
+Scan code set 2 with translation should be assumed in
+every case, as the default starting position.
+
+However, GRUB is trying to detect and use other modes
+such as set 2 without translation, or set 1 without
+translation from set 2; it also detects no-mode and
+assumes mode 1, on really old keyboards.
+
+The current behaviour has been retained, for everything
+except GRUB_MACHINE_COREBOOT; for the latter, scan code
+set 2 with translation is hardcoded, and forced in code.
+
+This is required to make keyboard initialisation work on
+the MEC5035 EC used by the Dell Latitude E6400, when
+running GRUB as a coreboot payload on that laptop. The
+EC reports scancode set 2 with translation when probed,
+but actually only outputs scancode set 1.
+
+Since GRUB is attempting to use it without translation,
+and since the machine reports set 2 with translation,
+but only ever outputs set 1 scancodes, this results in
+wrong keypresses for every key.
+
+This fix fixed that, by forcing set 2 with translation,
+treating it as set 1, but only on coreboot. This is the
+same behaviour used in GNU+Linux systems and SeaBIOS.
+With this change, GRUB keyboard initialisation now works
+just fine on those machines.
+
+This has *also* been tested on other coreboot machines
+running GRUB; several HP EliteBooks, ThinkPads and
+Dell Precision T1650. All seems to work just fine.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ grub-core/term/at_keyboard.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index f8a129eb7..8207225c2 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -138,6 +138,7 @@ write_mode (int mode)
+   return (i != GRUB_AT_TRIES);
+ }
+ 
++#if !defined (GRUB_MACHINE_COREBOOT)
+ static int
+ query_mode (void)
+ {
+@@ -161,10 +162,12 @@ query_mode (void)
+     return 3;
+   return 0;
+ }
++#endif
+ 
+ static void
+ set_scancodes (void)
+ {
++#if !defined (GRUB_MACHINE_COREBOOT)
+   /* You must have visited computer museum. Keyboard without scancode set
+      knowledge. Assume XT. */
+   if (!grub_keyboard_orig_set)
+@@ -173,20 +176,33 @@ set_scancodes (void)
+       ps2_state.current_set = 1;
+       return;
+     }
++#endif
+ 
+ #if !USE_SCANCODE_SET
+   ps2_state.current_set = 1;
+   return;
+-#else
++#endif
+ 
++#if defined (GRUB_MACHINE_COREBOOT)
++  /* enable translation */
++  grub_keyboard_controller_write (grub_keyboard_controller_orig
++				  & ~KEYBOARD_AT_DISABLE);
++#else
++  /* if not coreboot, disable translation and try mode 2 first, before 1 */
+   grub_keyboard_controller_write (grub_keyboard_controller_orig
+ 				  & ~KEYBOARD_AT_TRANSLATE
+ 				  & ~KEYBOARD_AT_DISABLE);
++#endif
+ 
+   keyboard_controller_wait_until_ready ();
+   grub_outb (KEYBOARD_COMMAND_ENABLE, KEYBOARD_REG_DATA);
+-
+   write_mode (2);
++
++#if defined (GRUB_MACHINE_COREBOOT)
++  /* mode 2 with translation, so make grub treat as set 1 */
++  ps2_state.current_set = 1;
++#else
++  /* if not coreboot, translation isn't set; test 2 and fall back to 1 */
+   ps2_state.current_set = query_mode ();
+   grub_dprintf ("atkeyb", "returned set %d\n", ps2_state.current_set);
+   if (ps2_state.current_set == 2)
+-- 
+2.39.2
+

config/grub/patches/0003-keyboardfix/0002-keylayouts-don-t-print-Unknown-key-message.patch

@@ -0,0 +1,38 @@
+From 0a6abeb40ac4284fbff6ef5958989d561b6290a7 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Tue, 31 Oct 2023 10:33:28 +0000
+Subject: [PATCH 1/1] keylayouts: don't print "Unknown key" message
+
+on keyboards with stuck keys, this results in GRUB just
+spewing it repeatedly, preventing use of GRUB.
+
+in such cases, it's still possible to use the keyboard,
+and we should let the user at least boot.
+
+it often appears when people plug in faulty usb keyboards,
+but can appear for laptop keyboards too; one of my e6400
+has stuck keys.
+
+with this patch, grub should be a bit more reliable in
+terms of user experience, when the keyboard is faulty.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ grub-core/commands/keylayouts.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
+index aa3ba34f2..445fa0601 100644
+--- a/grub-core/commands/keylayouts.c
++++ b/grub-core/commands/keylayouts.c
+@@ -174,7 +174,6 @@ grub_term_map_key (grub_keyboard_key_t code, int status)
+   key = map_key_core (code, status, &alt_gr_consumed);
+ 
+   if (key == 0 || key == GRUB_TERM_SHIFT) {
+-    grub_printf ("Unknown key 0x%x detected\n", code);
+     return GRUB_TERM_NO_KEY;
+   }
+ 
+-- 
+2.39.2
+

config/grub/patches/0004-prefix/0001-don-t-print-missing-prefix-errors-on-the-screen.patch

@@ -0,0 +1,102 @@
+From 9e7a651a0f15f2e9dec65a77765c3c4fd97b4165 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Sun, 5 Nov 2023 16:14:58 +0000
+Subject: [PATCH 1/1] don't print missing prefix errors on the screen
+
+we do actually set the prefix. this patch modifies
+grub to still set grub_errno and return accordingly,
+so the behaviour is otherwise identical, but it will
+no longer print a warning message on the screen.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ grub-core/commands/keylayouts.c | 2 +-
+ grub-core/commands/loadenv.c    | 2 +-
+ grub-core/commands/nativedisk.c | 2 +-
+ grub-core/efiemu/main.c         | 3 +--
+ grub-core/font/font.c           | 2 +-
+ grub-core/kern/dl.c             | 2 +-
+ 6 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
+index 445fa0601..00bcf7025 100644
+--- a/grub-core/commands/keylayouts.c
++++ b/grub-core/commands/keylayouts.c
+@@ -211,7 +211,7 @@ grub_cmd_keymap (struct grub_command *cmd __attribute__ ((unused)),
+     {
+       const char *prefix = grub_env_get ("prefix");
+       if (!prefix)
+-	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("variable `%s' isn't set"), "prefix");
++	return (grub_errno = GRUB_ERR_BAD_ARGUMENT);
+       filename = grub_xasprintf ("%s/layouts/%s.gkb", prefix, argv[0]);
+       if (!filename)
+ 	return grub_errno;
+diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
+index 166445849..699b39bfa 100644
+--- a/grub-core/commands/loadenv.c
++++ b/grub-core/commands/loadenv.c
+@@ -58,7 +58,7 @@ open_envblk_file (char *filename,
+       prefix = grub_env_get ("prefix");
+       if (! prefix)
+         {
+-          grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
++          grub_errno = GRUB_ERR_FILE_NOT_FOUND;
+           return 0;
+         }
+ 
+diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
+index 580c8d3b0..6806bff9c 100644
+--- a/grub-core/commands/nativedisk.c
++++ b/grub-core/commands/nativedisk.c
+@@ -186,7 +186,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
+   prefix = grub_env_get ("prefix");
+ 
+   if (! prefix)
+-    return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
++    return (grub_errno = GRUB_ERR_FILE_NOT_FOUND);
+ 
+   if (prefix)
+     path_prefix = (prefix[0] == '(') ? grub_strchr (prefix, ')') : NULL;
+diff --git a/grub-core/efiemu/main.c b/grub-core/efiemu/main.c
+index e7037f4ed..e5d4dbff1 100644
+--- a/grub-core/efiemu/main.c
++++ b/grub-core/efiemu/main.c
+@@ -231,8 +231,7 @@ grub_efiemu_autocore (void)
+   prefix = grub_env_get ("prefix");
+ 
+   if (! prefix)
+-    return grub_error (GRUB_ERR_FILE_NOT_FOUND,
+-		       N_("variable `%s' isn't set"), "prefix");
++    return (grub_errno = GRUB_ERR_FILE_NOT_FOUND);
+ 
+   suffix = grub_efiemu_get_default_core_name ();
+ 
+diff --git a/grub-core/font/font.c b/grub-core/font/font.c
+index 18de52562..2a0fea6c8 100644
+--- a/grub-core/font/font.c
++++ b/grub-core/font/font.c
+@@ -461,7 +461,7 @@ grub_font_load (const char *filename)
+ 
+ 	  if (!prefix)
+ 	    {
+-	      grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
++              grub_errno = GRUB_ERR_FILE_NOT_FOUND;
+ 	      goto fail;
+ 	    }
+ 	  file = try_open_from_prefix (prefix, filename);
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 4011e2d15..af3bd00d0 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -758,7 +758,7 @@ grub_dl_load (const char *name)
+     return 0;
+ 
+   if (! grub_dl_dir) {
+-    grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
++    grub_errno = GRUB_ERR_FILE_NOT_FOUND;
+     return 0;
+   }
+ 
+-- 
+2.39.2
+

config/grub/patches/0004-prefix/0002-don-t-print-error-if-module-not-found.patch

@@ -0,0 +1,34 @@
+From 6237c5762edccc1e1fa4746b1d4aa5e8d81e4883 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Sun, 5 Nov 2023 16:36:22 +0000
+Subject: [PATCH 1/1] don't print error if module not found
+
+still set grub_errno accordingly, and otherwise
+behave the same. in libreboot, we remove a lot of
+modules but then rely on loading a grub.cfg
+provided by a distro; in almost all cases that works,
+but also in almost all cases, that will try to load
+a module we don't actually need, but then it prints
+a message. this can annoy some users, so silence it.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ grub-core/kern/dl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index af3bd00d0..21d0cedb1 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -486,7 +486,7 @@ grub_dl_resolve_name (grub_dl_t mod, Elf_Ehdr *e)
+ 
+   s = grub_dl_find_section (e, ".modname");
+   if (!s)
+-    return grub_error (GRUB_ERR_BAD_MODULE, "no module name found");
++    return (grub_errno = GRUB_ERR_BAD_MODULE);
+ 
+   mod->name = grub_strdup ((char *) e + s->sh_offset);
+   if (! mod->name)
+-- 
+2.39.2
+

config/grub/patches/0004-prefix/0003-don-t-print-empty-error-messages.patch

@@ -0,0 +1,31 @@
+From e5b7ec81421487e71bcaf8b6b5a27f3649a62753 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Sun, 5 Nov 2023 17:25:20 +0000
+Subject: [PATCH 1/1] don't print empty error messages
+
+this is part two of the quest to kill the prefix
+error message. after i disabled prefix-related
+messages, it still printed "error: ." on screen.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ grub-core/kern/err.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
+index 53c734de7..7cac53983 100644
+--- a/grub-core/kern/err.c
++++ b/grub-core/kern/err.c
+@@ -107,7 +107,8 @@ grub_print_error (void)
+     {
+       if (grub_errno != GRUB_ERR_NONE)
+ 	{
+-	  grub_err_printf (_("error: %s.\n"), grub_errmsg);
++          if (grub_strlen(grub_errmsg) > 0)
++	    grub_err_printf (_("error: %s.\n"), grub_errmsg);
+ 	  grub_err_printed_errors++;
+ 	}
+     }
+-- 
+2.39.2
+

config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch

@@ -0,0 +1,41 @@
+From 81d850494c3cde1da33cc2df44837c839c1f2c60 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Fri, 6 Oct 2023 23:17:06 +0100
+Subject: [PATCH 1/1] add central Makefile in main directory
+
+it only does build64. i'm disabling use of 32-bit memtest in lbmk,
+until i can figure out a more consistent cross-compile method,
+rather than relying on hostcc.
+
+a user on irc reported build issues on pop os
+
+it's not pop's fault. lbmk needs to start handling cross
+compilers properly. (alternatively, i could rig memtest86+
+to use crossgcc. i'll explore that later)
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..59fcbef
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,11 @@
++# SPDX-License-Identifier: MIT
++# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
++
++all:
++	make -C build64
++
++clean:
++	make -C build64 clean
++
++distclean:
++	make -C build64 clean
+-- 
+2.39.2
+

config/seabios/build.list

@@ -0,0 +1,2 @@
+out/bios.bin.elf
+out/vgabios.bin

config/seabios/default/target.cfg

@@ -0,0 +1,3 @@
+arch="x86_32"
+tree="default"
+rev="1e1da7a963007d03a4e0e9a9e0ff17990bb1608d"