539 files changed, 428 insertions, 457 deletions

diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg
deleted file mode 100644
index 47e228b7..00000000
--- a/config/coreboot/w541_12mb/target.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-tree="default"
-xarch="i386-elf"
-payload_seabios="y"
-payload_grub="y"
-payload_memtest="y"
-grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
-vcfg="haswell"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot="amd64"
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 2853e4f5..e49d9ec3 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -1,7 +1,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# can be overridden per-tree e.g. use mrchromebox
+url="https://github.com/coreboot/coreboot.git"
+bkup_url="https://review.coreboot.org/coreboot"
+
 makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/default memtest86plus/default u-boot/amd64coreboot"
 
 seavgabiosrom="elf/seabios/default/default/libgfxinit/vgabios.bin"
 
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
index 35b44030..4bf0536a 100644
--- a/config/data/grub/mkhelper.cfg
+++ b/config/data/grub/mkhelper.cfg
@@ -1,7 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# can be overridden per-tree
+url="git://git.savannah.gnu.org/grub.git"
+bkup_url="https://codeberg.org/libreboot/grub"
+
 bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
 configureargs="--with-platform=coreboot --disable-werror"
 makeargs="FS_PAYLOAD_MODULES=\"\""
-buildtype="autohell"
 mkhelper="$if_not_dry_build mkpayload_grub"
diff --git a/config/data/libarchive/mkhelper.cfg b/config/data/libarchive/mkhelper.cfg
deleted file mode 100644
index f1678f17..00000000
--- a/config/data/libarchive/mkhelper.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-premake="autoreconf -fiv src/libarchive"
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg
deleted file mode 100644
index 5a4546a6..00000000
--- a/config/data/pico-serprog/mkhelper.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-sersrc="src/pico-serprog"
-serx="$sersrc/build/pico_serprog.uf2"
-picosdk="src/pico-sdk"
-serdir="$picosdk/src/boards/include/boards"
-premake="$if_not_dry_build eval fx_ \"buildser pico\" x_ basename -as .h \"\$serdir/\"*.h"
diff --git a/config/data/stm32-vserprog/mkhelper.cfg b/config/data/stm32-vserprog/mkhelper.cfg
deleted file mode 100644
index 26ea5acd..00000000
--- a/config/data/stm32-vserprog/mkhelper.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-sersrc="src/stm32-vserprog"
-serx="$sersrc/stm32-vserprog.hex"
-serdir="$sersrc/boards"
-mkhelper="$if_not_dry_build eval fx_ \"buildser stm32\" x_ basename -as .h \"\$serdir/\"*.h"
diff --git a/config/git/u-boot/pkg.cfg b/config/data/u-boot/mkhelper.cfg
index ddccbc02..c47f9580 100644
--- a/config/git/u-boot/pkg.cfg
+++ b/config/data/u-boot/mkhelper.cfg
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="HEAD"
 url="https://source.denx.de/u-boot/u-boot.git"
 bkup_url="https://github.com/u-boot/u-boot.git"
diff --git a/config/git/coreboot/pkg.cfg b/config/git/coreboot/pkg.cfg
deleted file mode 100644
index ee81a0d4..00000000
--- a/config/git/coreboot/pkg.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="HEAD"
-url="https://github.com/coreboot/coreboot.git"
-bkup_url="https://review.coreboot.org/coreboot"
diff --git a/config/git/grub/pkg.cfg b/config/git/grub/pkg.cfg
deleted file mode 100644
index 88bc45d8..00000000
--- a/config/git/grub/pkg.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="HEAD"
-url="git://git.savannah.gnu.org/grub.git"
-bkup_url="https://codeberg.org/libreboot/grub"
diff --git a/config/git/pico-serprog/pkg.cfg b/config/git/pico-serprog/pkg.cfg
deleted file mode 100644
index 03b45a1b..00000000
--- a/config/git/pico-serprog/pkg.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="3ea792664ed29ca1ff3e2e78d1d16099684781bd"
-url="https://codeberg.org/libreboot/pico-serprog"
-bkup_url="https://git.disroot.org/libreboot/pico-serprog"
-depend="pico-sdk"
diff --git a/config/git/stm32-vserprog/pkg.cfg b/config/git/stm32-vserprog/pkg.cfg
deleted file mode 100644
index 9fc1de0c..00000000
--- a/config/git/stm32-vserprog/pkg.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="8fcf0a4d41800631b571fa7bbd1d8b251f0a2111"
-url="https://codeberg.org/libreboot/stm32-vserprog"
-bkup_url="https://git.disroot.org/libreboot/stm32-vserprog"
diff --git a/config/git/bios_extract/pkg.cfg b/config/module/bios_extract/default/target.cfg
index 95879be6..c85c6507 100644
--- a/config/git/bios_extract/pkg.cfg
+++ b/config/module/bios_extract/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0"
 url="https://github.com/coreboot/bios_extract"
 bkup_url="https://review.coreboot.org/bios_extract"
+
+rev="0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/git/biosutilities/pkg.cfg b/config/module/biosutilities/default/target.cfg
index 7b9ea9d6..60dc4cb8 100644
--- a/config/git/biosutilities/pkg.cfg
+++ b/config/module/biosutilities/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="03ae0cf0706ede5a2a15da0986c19c776d0e6b26"
 url="https://codeberg.org/libreboot/BIOSUtilities"
 bkup_url="https://github.com/platomav/BIOSUtilities"
+
+rev="03ae0cf0706ede5a2a15da0986c19c776d0e6b26"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/coreboot/d510mo/config/libgfxinit_txtmode b/config/module/coreboot/d510mo/config/libgfxinit_txtmode
index e1a3deed..e1a3deed 100644
--- a/config/coreboot/d510mo/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d510mo/config/libgfxinit_txtmode
diff --git a/config/coreboot/d510mo/target.cfg b/config/module/coreboot/d510mo/target.cfg
index e6c6d033..af063079 100644
--- a/config/coreboot/d510mo/target.cfg
+++ b/config/module/coreboot/d510mo/target.cfg
@@ -5,4 +5,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 release="n"
-build_depend="seabios/default memtest86plus"
+build_depend="seabios/default memtest86plus/default"
diff --git a/config/coreboot/d510mo_16mb/config/libgfxinit_txtmode b/config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode
index d6950c94..d6950c94 100644
--- a/config/coreboot/d510mo_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/d510mo_16mb/target.cfg b/config/module/coreboot/d510mo_16mb/target.cfg
index cbb93fc1..cbb93fc1 100644
--- a/config/coreboot/d510mo_16mb/target.cfg
+++ b/config/module/coreboot/d510mo_16mb/target.cfg
diff --git a/config/coreboot/d945gclf_512kb/config/libgfxinit_txtmode b/config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode
index 900af6f7..900af6f7 100644
--- a/config/coreboot/d945gclf_512kb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode
diff --git a/config/coreboot/d945gclf_512kb/target.cfg b/config/module/coreboot/d945gclf_512kb/target.cfg
index 8bddc19c..8bddc19c 100644
--- a/config/coreboot/d945gclf_512kb/target.cfg
+++ b/config/module/coreboot/d945gclf_512kb/target.cfg
diff --git a/config/coreboot/d945gclf_8mb/config/libgfxinit_txtmode b/config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode
index a6d5075e..a6d5075e 100644
--- a/config/coreboot/d945gclf_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/d945gclf_8mb/target.cfg b/config/module/coreboot/d945gclf_8mb/target.cfg
index 447dc86b..447dc86b 100644
--- a/config/coreboot/d945gclf_8mb/target.cfg
+++ b/config/module/coreboot/d945gclf_8mb/target.cfg
diff --git a/config/coreboot/default/nuke.list b/config/module/coreboot/default/nuke.list
index e6c247d2..e6c247d2 100644
--- a/config/coreboot/default/nuke.list
+++ b/config/module/coreboot/default/nuke.list
diff --git a/config/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch b/config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch
index b654b32c..b654b32c 100644
--- a/config/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch
+++ b/config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch
diff --git a/config/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch b/config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch
index 20fff9eb..20fff9eb 100644
--- a/config/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch
+++ b/config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch
diff --git a/config/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch b/config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch
index 8e814be3..8e814be3 100644
--- a/config/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch
+++ b/config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch
diff --git a/config/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch b/config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch
index 43830448..43830448 100644
--- a/config/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch
+++ b/config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch
diff --git a/config/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch b/config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch
index 8490157a..8490157a 100644
--- a/config/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch
+++ b/config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch
diff --git a/config/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch b/config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch
index 725c6380..725c6380 100644
--- a/config/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch
+++ b/config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch
diff --git a/config/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch b/config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch
index e583accc..e583accc 100644
--- a/config/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch
+++ b/config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch
diff --git a/config/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch b/config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch
index a450cb4e..a450cb4e 100644
--- a/config/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch
+++ b/config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch
diff --git a/config/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch b/config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch
index d67bdf03..d67bdf03 100644
--- a/config/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch
+++ b/config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch
diff --git a/config/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch b/config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch
index e01800af..e01800af 100644
--- a/config/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch
+++ b/config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch
diff --git a/config/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch b/config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch
index 235ee880..235ee880 100644
--- a/config/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch
+++ b/config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch
diff --git a/config/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch b/config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch
index 3e6b8085..3e6b8085 100644
--- a/config/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch
+++ b/config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch
diff --git a/config/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch b/config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch
index 56b61882..56b61882 100644
--- a/config/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch
+++ b/config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch
diff --git a/config/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch b/config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch
index 722e895d..722e895d 100644
--- a/config/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch
+++ b/config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch
diff --git a/config/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch b/config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch
index ac672295..ac672295 100644
--- a/config/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch
+++ b/config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch
diff --git a/config/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch b/config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch
index e7c8d0a9..e7c8d0a9 100644
--- a/config/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch
+++ b/config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch
diff --git a/config/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch b/config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch
index 51ba3ae7..51ba3ae7 100644
--- a/config/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch
+++ b/config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch
diff --git a/config/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch b/config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch
index fdb225e8..fdb225e8 100644
--- a/config/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch
+++ b/config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch
diff --git a/config/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch b/config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch
index b7af55b4..b7af55b4 100644
--- a/config/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch
+++ b/config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch
diff --git a/config/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch b/config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch
index c9603f71..c9603f71 100644
--- a/config/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch
+++ b/config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch
diff --git a/config/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch b/config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch
index 238e4799..238e4799 100644
--- a/config/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch
+++ b/config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch
diff --git a/config/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch b/config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch
index deaefbfd..deaefbfd 100644
--- a/config/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch
+++ b/config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch
diff --git a/config/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch b/config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch
index 3bb55c37..3bb55c37 100644
--- a/config/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch
+++ b/config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch
diff --git a/config/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch b/config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch
index 22061393..22061393 100644
--- a/config/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch
+++ b/config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch
diff --git a/config/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch b/config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch
index c126ee58..c126ee58 100644
--- a/config/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch
+++ b/config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch
diff --git a/config/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch b/config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch
index 4c693f65..4c693f65 100644
--- a/config/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch
+++ b/config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch
diff --git a/config/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch b/config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch
index da5ae94d..da5ae94d 100644
--- a/config/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch
+++ b/config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch
diff --git a/config/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch b/config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch
index 52b49b36..52b49b36 100644
--- a/config/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch
+++ b/config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch
diff --git a/config/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch b/config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch
index 78ccf785..78ccf785 100644
--- a/config/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch
+++ b/config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch
diff --git a/config/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch b/config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch
index e5f4987b..e5f4987b 100644
--- a/config/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch
+++ b/config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch
diff --git a/config/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch b/config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch
index d1d47338..d1d47338 100644
--- a/config/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch
+++ b/config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch
diff --git a/config/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch b/config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch
index 6ed150e7..6ed150e7 100644
--- a/config/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch
+++ b/config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch
diff --git a/config/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch b/config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch
index 64f257e4..64f257e4 100644
--- a/config/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch
+++ b/config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch
diff --git a/config/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch b/config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch
index bb6e39c0..bb6e39c0 100644
--- a/config/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch
+++ b/config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch
diff --git a/config/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch b/config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch
index 2292605e..2292605e 100644
--- a/config/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch
+++ b/config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch
diff --git a/config/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch b/config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch
index a4f9068d..a4f9068d 100644
--- a/config/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch
+++ b/config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch
diff --git a/config/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch b/config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch
index d740f7a7..d740f7a7 100644
--- a/config/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch
+++ b/config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch
diff --git a/config/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch b/config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch
index dd5412a2..dd5412a2 100644
--- a/config/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch
+++ b/config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch
diff --git a/config/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch b/config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch
index 1814806f..1814806f 100644
--- a/config/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch
+++ b/config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch
diff --git a/config/coreboot/default/patches/0040-fix-ifdtool-build.patch b/config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch
index b39fbc0b..b39fbc0b 100644
--- a/config/coreboot/default/patches/0040-fix-ifdtool-build.patch
+++ b/config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch
diff --git a/config/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch b/config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch
index 8f61bcd0..8f61bcd0 100644
--- a/config/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch
+++ b/config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch
diff --git a/config/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch b/config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch
index 4ce1241c..4ce1241c 100644
--- a/config/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch
+++ b/config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch
diff --git a/config/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch b/config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch
index e5ea4f3c..e5ea4f3c 100644
--- a/config/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch
+++ b/config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch
diff --git a/config/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch b/config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch
index ae70996f..ae70996f 100644
--- a/config/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch
+++ b/config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch
diff --git a/config/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch b/config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch
index e4622ce4..e4622ce4 100644
--- a/config/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch
+++ b/config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch
diff --git a/config/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch b/config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch
index 45539084..45539084 100644
--- a/config/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch
+++ b/config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch
diff --git a/config/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch b/config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch
index cfd5c6c9..cfd5c6c9 100644
--- a/config/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch
+++ b/config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch
diff --git a/config/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch b/config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch
index 76fc54e2..76fc54e2 100644
--- a/config/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch
+++ b/config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch
diff --git a/config/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch b/config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch
index df86ee01..df86ee01 100644
--- a/config/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch
+++ b/config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch
diff --git a/config/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch b/config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch
index a2e5d5a2..a2e5d5a2 100644
--- a/config/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch
+++ b/config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch
diff --git a/config/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch b/config/module/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch
index 58c1a1d9..58c1a1d9 100644
--- a/config/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch
+++ b/config/module/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch
diff --git a/config/coreboot/default/target.cfg b/config/module/coreboot/default/target.cfg
index 3cd3e96e..15337647 100644
--- a/config/coreboot/default/target.cfg
+++ b/config/module/coreboot/default/target.cfg
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="default"
 rev="ed5a993f0f98a47d5e780e375e5861860019b183"
+
+tree="default"
diff --git a/config/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb
index 62cc030e..62cc030e 100644
--- a/config/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode
index 4d81f289..4d81f289 100644
--- a/config/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell3040micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg
index 1a3d751e..901b6074 100644
--- a/config/coreboot/dell3040micro_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg
@@ -8,6 +8,6 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="3040micro"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 IFD_platform="sklkbl"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb
index 99998313..99998313 100644
--- a/config/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode
index 9f5aa9a8..9f5aa9a8 100644
--- a/config/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell3050micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg
index 4e04f453..5bfc88c9 100644
--- a/config/coreboot/dell3050micro_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg
@@ -8,6 +8,6 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="3050micro"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 IFD_platform="sklkbl"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb
index 474db12d..474db12d 100644
--- a/config/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode
index c4f40acb..c4f40acb 100644
--- a/config/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell3050microsecure_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg
index 37455fbe..093468ab 100644
--- a/config/coreboot/dell3050microsecure_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg
@@ -8,7 +8,7 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="3050micro"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 IFD_platform="sklkbl"
 payload_uboot="amd64"
 payload_grubsea="y"
diff --git a/config/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode b/config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode
index 15092703..15092703 100644
--- a/config/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/module/coreboot/dell7010sff_12mb/target.cfg
index 34865f86..895146ef 100644
--- a/config/coreboot/t1650_12mb/target.cfg
+++ b/config/module/coreboot/dell7010sff_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="t1650"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb
index 76720049..76720049 100644
--- a/config/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell780mt_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode
index 74484731..74484731 100644
--- a/config/coreboot/dell780mt_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell780mt_truncate_8mb/target.cfg b/config/module/coreboot/dell780mt_8mb/target.cfg
index a58de7bd..5d795c50 100644
--- a/config/coreboot/dell780mt_truncate_8mb/target.cfg
+++ b/config/module/coreboot/dell780mt_8mb/target.cfg
@@ -7,5 +7,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb
index 415801a7..415801a7 100644
--- a/config/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode
index 13e026b7..13e026b7 100644
--- a/config/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell780usff_truncate_8mb/target.cfg b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg
index a58de7bd..5d795c50 100644
--- a/config/coreboot/dell780usff_truncate_8mb/target.cfg
+++ b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg
@@ -7,5 +7,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb
index 6f1f4868..6f1f4868 100644
--- a/config/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell780usff_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode
index 3190e3bc..3190e3bc 100644
--- a/config/coreboot/dell780usff_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell780usff_8mb/target.cfg b/config/module/coreboot/dell780usff_8mb/target.cfg
index a58de7bd..5d795c50 100644
--- a/config/coreboot/dell780usff_8mb/target.cfg
+++ b/config/module/coreboot/dell780usff_8mb/target.cfg
@@ -7,5 +7,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb
index 30504448..30504448 100644
--- a/config/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode
index 184d1d14..184d1d14 100644
--- a/config/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell780mt_8mb/target.cfg b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg
index a58de7bd..5d795c50 100644
--- a/config/coreboot/dell780mt_8mb/target.cfg
+++ b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg
@@ -7,5 +7,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb
index 850a1ca1..850a1ca1 100644
--- a/config/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode
index aa51b29a..aa51b29a 100644
--- a/config/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/module/coreboot/dell9020mt_nri_12mb/target.cfg
index 47e228b7..ddbbe740 100644
--- a/config/coreboot/t440plibremrc_12mb/target.cfg
+++ b/config/module/coreboot/dell9020mt_nri_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb
index 0267e00d..0267e00d 100644
--- a/config/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode
index 6300dc33..6300dc33 100644
--- a/config/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell9020sff_nri_12mb/target.cfg b/config/module/coreboot/dell9020sff_nri_12mb/target.cfg
index 47e228b7..ddbbe740 100644
--- a/config/coreboot/dell9020sff_nri_12mb/target.cfg
+++ b/config/module/coreboot/dell9020sff_nri_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/e4300_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb
index 0b2a048b..0b2a048b 100644
--- a/config/coreboot/e4300_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e4300_4mb/config/libgfxinit_txtmode b/config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode
index 0ae67f0b..0ae67f0b 100644
--- a/config/coreboot/e4300_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e4300_4mb/target.cfg b/config/module/coreboot/e4300_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/e4300_4mb/target.cfg
+++ b/config/module/coreboot/e4300_4mb/target.cfg
diff --git a/config/coreboot/e5420_6mb/config/libgfxinit_corebootfb b/config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb
index 5c6df8d8..5c6df8d8 100644
--- a/config/coreboot/e5420_6mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e5420_6mb/config/libgfxinit_txtmode b/config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode
index dbfa8720..dbfa8720 100644
--- a/config/coreboot/e5420_6mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e5420_6mb/target.cfg b/config/module/coreboot/e5420_6mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/e5420_6mb/target.cfg
+++ b/config/module/coreboot/e5420_6mb/target.cfg
diff --git a/config/coreboot/e5520_6mb/config/libgfxinit_corebootfb b/config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb
index 67491751..67491751 100644
--- a/config/coreboot/e5520_6mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e5520_6mb/config/libgfxinit_txtmode b/config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode
index 33336017..33336017 100644
--- a/config/coreboot/e5520_6mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e5520_6mb/target.cfg b/config/module/coreboot/e5520_6mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/e5520_6mb/target.cfg
+++ b/config/module/coreboot/e5520_6mb/target.cfg
diff --git a/config/coreboot/e5530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb
index 5465cc5e..5465cc5e 100644
--- a/config/coreboot/e5530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e5530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode
index 4f020253..4f020253 100644
--- a/config/coreboot/e5530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e5530_12mb/target.cfg b/config/module/coreboot/e5530_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/e5530_12mb/target.cfg
+++ b/config/module/coreboot/e5530_12mb/target.cfg
diff --git a/config/coreboot/e6220_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb
index f2c45f45..f2c45f45 100644
--- a/config/coreboot/e6220_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6220_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode
index 322a48d6..322a48d6 100644
--- a/config/coreboot/e6220_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6220_10mb/target.cfg b/config/module/coreboot/e6220_10mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/e6220_10mb/target.cfg
+++ b/config/module/coreboot/e6220_10mb/target.cfg
diff --git a/config/coreboot/e6230_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb
index 385e27dd..385e27dd 100644
--- a/config/coreboot/e6230_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6230_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode
index 735c4bb1..735c4bb1 100644
--- a/config/coreboot/e6230_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6230_12mb/target.cfg b/config/module/coreboot/e6230_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/e6230_12mb/target.cfg
+++ b/config/module/coreboot/e6230_12mb/target.cfg
diff --git a/config/coreboot/e6320_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb
index 32212d92..32212d92 100644
--- a/config/coreboot/e6320_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6320_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode
index 4be7e5c6..4be7e5c6 100644
--- a/config/coreboot/e6320_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6320_10mb/target.cfg b/config/module/coreboot/e6320_10mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/e6320_10mb/target.cfg
+++ b/config/module/coreboot/e6320_10mb/target.cfg
diff --git a/config/coreboot/e6330_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb
index 8a326e29..8a326e29 100644
--- a/config/coreboot/e6330_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6330_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode
index f53a3274..f53a3274 100644
--- a/config/coreboot/e6330_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6330_12mb/target.cfg b/config/module/coreboot/e6330_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/e6330_12mb/target.cfg
+++ b/config/module/coreboot/e6330_12mb/target.cfg
diff --git a/config/coreboot/e6400_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb
index 8c5b93af..8c5b93af 100644
--- a/config/coreboot/e6400_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6400_4mb/config/libgfxinit_txtmode b/config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode
index bbffffa6..bbffffa6 100644
--- a/config/coreboot/e6400_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/module/coreboot/e6400_4mb/target.cfg
index f7500e97..f7500e97 100644
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/module/coreboot/e6400_4mb/target.cfg
diff --git a/config/coreboot/e6400nvidia_4mb/config/normal b/config/module/coreboot/e6400nvidia_4mb/config/normal
index 55722554..55722554 100644
--- a/config/coreboot/e6400nvidia_4mb/config/normal
+++ b/config/module/coreboot/e6400nvidia_4mb/config/normal
diff --git a/config/coreboot/e6400nvidia_4mb/target.cfg b/config/module/coreboot/e6400nvidia_4mb/target.cfg
index e87c8f32..e87c8f32 100644
--- a/config/coreboot/e6400nvidia_4mb/target.cfg
+++ b/config/module/coreboot/e6400nvidia_4mb/target.cfg
diff --git a/config/coreboot/e6420_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb
index 7f62e506..7f62e506 100644
--- a/config/coreboot/e6420_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6420_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode
index 36b0626b..36b0626b 100644
--- a/config/coreboot/e6420_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6420_10mb/target.cfg b/config/module/coreboot/e6420_10mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/e6420_10mb/target.cfg
+++ b/config/module/coreboot/e6420_10mb/target.cfg
diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb
index 87837306..87837306 100644
--- a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode
index 750dd84c..750dd84c 100644
--- a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/module/coreboot/e6430_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/e6430_12mb/target.cfg
+++ b/config/module/coreboot/e6430_12mb/target.cfg
diff --git a/config/coreboot/e6520_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb
index c9217477..c9217477 100644
--- a/config/coreboot/e6520_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6520_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode
index 5805b602..5805b602 100644
--- a/config/coreboot/e6520_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6520_10mb/target.cfg b/config/module/coreboot/e6520_10mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/e6520_10mb/target.cfg
+++ b/config/module/coreboot/e6520_10mb/target.cfg
diff --git a/config/coreboot/e6530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb
index 1a5786d3..1a5786d3 100644
--- a/config/coreboot/e6530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e6530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode
index 26930b80..26930b80 100644
--- a/config/coreboot/e6530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/module/coreboot/e6530_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/e6530_12mb/target.cfg
+++ b/config/module/coreboot/e6530_12mb/target.cfg
diff --git a/config/coreboot/e7240_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb
index 6280c5ef..6280c5ef 100644
--- a/config/coreboot/e7240_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/e7240_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode
index e41d9461..e41d9461 100644
--- a/config/coreboot/e7240_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/e7240_12mb/target.cfg b/config/module/coreboot/e7240_12mb/target.cfg
index fcd02188..a58b743f 100644
--- a/config/coreboot/e7240_12mb/target.cfg
+++ b/config/module/coreboot/e7240_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="ahci"
 grubtree="xhci_nvme"
 vcfg="e7240"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/fam15h/nuke.list b/config/module/coreboot/fam15h/nuke.list
index 8ca7a4cf..8ca7a4cf 100644
--- a/config/coreboot/fam15h/nuke.list
+++ b/config/module/coreboot/fam15h/nuke.list
diff --git a/config/coreboot/fam15h/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch b/config/module/coreboot/fam15h/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch
index 5a39bd69..5a39bd69 100644
--- a/config/coreboot/fam15h/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch
+++ b/config/module/coreboot/fam15h/patches/0003-Tweak-cmos-defaults-for-KCMA-D8-for-a-little-speed-b.patch
diff --git a/config/coreboot/fam15h/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch b/config/module/coreboot/fam15h/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch
index 5ada0dff..5ada0dff 100644
--- a/config/coreboot/fam15h/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch
+++ b/config/module/coreboot/fam15h/patches/0006-asus-kgpe-d16-enable-lc_cache_partitioning-and-exper.patch
diff --git a/config/coreboot/fam15h/patches/0007-util-cbfstool-Makefile-support-distclean.patch b/config/module/coreboot/fam15h/patches/0007-util-cbfstool-Makefile-support-distclean.patch
index 87db312c..87db312c 100644
--- a/config/coreboot/fam15h/patches/0007-util-cbfstool-Makefile-support-distclean.patch
+++ b/config/module/coreboot/fam15h/patches/0007-util-cbfstool-Makefile-support-distclean.patch
diff --git a/config/coreboot/fam15h/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch b/config/module/coreboot/fam15h/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch
index 72681490..72681490 100644
--- a/config/coreboot/fam15h/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch
+++ b/config/module/coreboot/fam15h/patches/0008-crossgcc-patch-binutils-2.32-for-newer-hostcc.patch
diff --git a/config/coreboot/fam15h/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch b/config/module/coreboot/fam15h/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch
index ecc06d00..ecc06d00 100644
--- a/config/coreboot/fam15h/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch
+++ b/config/module/coreboot/fam15h/patches/0009-fix-crossgcc-acpica-build-on-newer-hostcc.patch
diff --git a/config/coreboot/fam15h/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch b/config/module/coreboot/fam15h/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch
index b48e88cd..b48e88cd 100644
--- a/config/coreboot/fam15h/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch
+++ b/config/module/coreboot/fam15h/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch
diff --git a/config/coreboot/fam15h/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch b/config/module/coreboot/fam15h/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch
index bee2d89a..bee2d89a 100644
--- a/config/coreboot/fam15h/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch
+++ b/config/module/coreboot/fam15h/patches/0011-use-mirrorservire.org-for-gcc-downloads.patch
diff --git a/config/coreboot/fam15h/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch b/config/module/coreboot/fam15h/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch
index c767968b..c767968b 100644
--- a/config/coreboot/fam15h/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch
+++ b/config/module/coreboot/fam15h/patches/0012-buildgcc-don-t-treat-binutil-warnings-as-errors.patch
diff --git a/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch b/config/module/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch
index b08c9edf..b08c9edf 100644
--- a/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch
+++ b/config/module/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch
diff --git a/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch b/config/module/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch
index d9de94c6..d9de94c6 100644
--- a/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch
+++ b/config/module/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch
diff --git a/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch b/config/module/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch
index 40ea7c14..40ea7c14 100644
--- a/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch
+++ b/config/module/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch
diff --git a/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch b/config/module/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch
index 1287a02d..1287a02d 100644
--- a/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch
+++ b/config/module/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch
diff --git a/config/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch b/config/module/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch
index 8dc52ac9..8dc52ac9 100644
--- a/config/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch
+++ b/config/module/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch
diff --git a/config/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch b/config/module/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch
index d712f444..d712f444 100644
--- a/config/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch
+++ b/config/module/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch
diff --git a/config/coreboot/fam15h/patches/0019-fix-gcc-error-with-__unused.patch b/config/module/coreboot/fam15h/patches/0019-fix-gcc-error-with-__unused.patch
index f6a2e643..f6a2e643 100644
--- a/config/coreboot/fam15h/patches/0019-fix-gcc-error-with-__unused.patch
+++ b/config/module/coreboot/fam15h/patches/0019-fix-gcc-error-with-__unused.patch
diff --git a/config/coreboot/fam15h/target.cfg b/config/module/coreboot/fam15h/target.cfg
index 1d4271e4..96ec0bd1 100644
--- a/config/coreboot/fam15h/target.cfg
+++ b/config/module/coreboot/fam15h/target.cfg
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="fam15h"
 rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
+
+tree="fam15h"
+
+xlang="c" # disable use of gnat on this tree
diff --git a/config/coreboot/g43t_am3/config/libgfxinit_txtmode b/config/module/coreboot/g43t_am3/config/libgfxinit_txtmode
index c789e2ee..c789e2ee 100644
--- a/config/coreboot/g43t_am3/config/libgfxinit_txtmode
+++ b/config/module/coreboot/g43t_am3/config/libgfxinit_txtmode
diff --git a/config/coreboot/g43t_am3/target.cfg b/config/module/coreboot/g43t_am3/target.cfg
index 357eee9a..df15ed4a 100644
--- a/config/coreboot/g43t_am3/target.cfg
+++ b/config/module/coreboot/g43t_am3/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode b/config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
index 2a52b003..2a52b003 100644
--- a/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/g43t_am3_16mb/target.cfg b/config/module/coreboot/g43t_am3_16mb/target.cfg
index a097a3e8..1b58e627 100644
--- a/config/coreboot/g43t_am3_16mb/target.cfg
+++ b/config/module/coreboot/g43t_am3_16mb/target.cfg
@@ -6,5 +6,5 @@ payload_seabios="y"
 payload_memtest="y"
 release="n"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode b/config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
index 38c13a09..38c13a09 100644
--- a/config/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
+++ b/config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
diff --git a/config/coreboot/ga_g41m_es2l/target.cfg b/config/module/coreboot/ga_g41m_es2l/target.cfg
index 3d046df2..3c5c2915 100644
--- a/config/coreboot/ga_g41m_es2l/target.cfg
+++ b/config/module/coreboot/ga_g41m_es2l/target.cfg
@@ -5,4 +5,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus/default"
diff --git a/config/coreboot/gru_bob/config/libgfxinit_corebootfb b/config/module/coreboot/gru_bob/config/libgfxinit_corebootfb
index a2687f76..a2687f76 100644
--- a/config/coreboot/gru_bob/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/gru_bob/config/libgfxinit_corebootfb
diff --git a/config/coreboot/gru_bob/target.cfg b/config/module/coreboot/gru_bob/target.cfg
index dda11b5f..dda11b5f 100644
--- a/config/coreboot/gru_bob/target.cfg
+++ b/config/module/coreboot/gru_bob/target.cfg
diff --git a/config/coreboot/gru_kevin/config/libgfxinit_corebootfb b/config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb
index f5ba41e1..f5ba41e1 100644
--- a/config/coreboot/gru_kevin/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb
diff --git a/config/coreboot/gru_kevin/target.cfg b/config/module/coreboot/gru_kevin/target.cfg
index 26fd442b..26fd442b 100644
--- a/config/coreboot/gru_kevin/target.cfg
+++ b/config/module/coreboot/gru_kevin/target.cfg
diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
index 1dcd3a32..1dcd3a32 100644
--- a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
index 7b456015..7b456015 100644
--- a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/module/coreboot/hp2170p_16mb/target.cfg
index d6868831..d6868831 100644
--- a/config/coreboot/hp2170p_16mb/target.cfg
+++ b/config/module/coreboot/hp2170p_16mb/target.cfg
diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
index 6f71de77..6f71de77 100644
--- a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
index e0baa5c8..e0baa5c8 100644
--- a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/module/coreboot/hp2560p_8mb/target.cfg
index fce385d9..fce385d9 100644
--- a/config/coreboot/hp2560p_8mb/target.cfg
+++ b/config/module/coreboot/hp2560p_8mb/target.cfg
diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
index a37fb3bf..a37fb3bf 100644
--- a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
index 7d3358f9..7d3358f9 100644
--- a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/module/coreboot/hp2570p_16mb/target.cfg
index 26c80f5f..26c80f5f 100644
--- a/config/coreboot/hp2570p_16mb/target.cfg
+++ b/config/module/coreboot/hp2570p_16mb/target.cfg
diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
index e7df9dbb..e7df9dbb 100644
--- a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
index 26b5aa94..26b5aa94 100644
--- a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/module/coreboot/hp8200sff_4mb/target.cfg
index 76effd9f..b19a1797 100644
--- a/config/coreboot/hp8200sff_8mb/target.cfg
+++ b/config/module/coreboot/hp8200sff_4mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hp8200sff"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
index bf5186cc..bf5186cc 100644
--- a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
index 884aa3de..884aa3de 100644
--- a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/module/coreboot/hp8200sff_8mb/target.cfg
index 76effd9f..b19a1797 100644
--- a/config/coreboot/hp8200sff_4mb/target.cfg
+++ b/config/module/coreboot/hp8200sff_8mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hp8200sff"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
index d916c455..d916c455 100644
--- a/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
index 0641093b..0641093b 100644
--- a/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/module/coreboot/hp820g2_12mb/target.cfg
index c837bffd..1e8690f7 100644
--- a/config/coreboot/hp820g2_12mb/target.cfg
+++ b/config/module/coreboot/hp820g2_12mb/target.cfg
@@ -8,4 +8,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="hp820g2"
-build_depend="seabios/default grub/xhci_nvme memtest86plus"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default"
diff --git a/config/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb
index 5b140d09..5b140d09 100644
--- a/config/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode
index 0ebc3d45..0ebc3d45 100644
--- a/config/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/module/coreboot/hp8300cmt_16mb/target.cfg
index f3fb43a7..85d360a7 100644
--- a/config/coreboot/hp8300cmt_16mb/target.cfg
+++ b/config/module/coreboot/hp8300cmt_16mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="ivybridge"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
index 535e1cb3..535e1cb3 100644
--- a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
index 0746d0ed..0746d0ed 100644
--- a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/module/coreboot/hp8300usdt_16mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/hp8300usdt_16mb/target.cfg
+++ b/config/module/coreboot/hp8300usdt_16mb/target.cfg
diff --git a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
index 62828ca6..62828ca6 100644
--- a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
index b39ae120..b39ae120 100644
--- a/config/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/module/coreboot/hp8460pintel_8mb/target.cfg
index 255bfac7..255bfac7 100644
--- a/config/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/module/coreboot/hp8460pintel_8mb/target.cfg
diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
index a29792c4..a29792c4 100644
--- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
index fecedd4a..fecedd4a 100644
--- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/module/coreboot/hp8470pintel_16mb/target.cfg
index 01b2ed5b..01b2ed5b 100644
--- a/config/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/module/coreboot/hp8470pintel_16mb/target.cfg
diff --git a/config/coreboot/hp8560w_8mb/config/normal b/config/module/coreboot/hp8560w_8mb/config/normal
index b54d5674..b54d5674 100644
--- a/config/coreboot/hp8560w_8mb/config/normal
+++ b/config/module/coreboot/hp8560w_8mb/config/normal
diff --git a/config/coreboot/hp8560w_8mb/target.cfg b/config/module/coreboot/hp8560w_8mb/target.cfg
index d1eb695f..d1eb695f 100644
--- a/config/coreboot/hp8560w_8mb/target.cfg
+++ b/config/module/coreboot/hp8560w_8mb/target.cfg
diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
index 56bd3e97..56bd3e97 100644
--- a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
index 86ff988c..86ff988c 100644
--- a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/module/coreboot/hp9470m_16mb/target.cfg
index 6ebd81c5..6ebd81c5 100644
--- a/config/coreboot/hp9470m_16mb/target.cfg
+++ b/config/module/coreboot/hp9470m_16mb/target.cfg
diff --git a/config/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb
index bd362313..bd362313 100644
--- a/config/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode
index f773342b..f773342b 100644
--- a/config/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/hppro3500series_8mb/target.cfg b/config/module/coreboot/hppro3500series_8mb/target.cfg
index 4d4031d2..1a495c17 100644
--- a/config/coreboot/hppro3500series_8mb/target.cfg
+++ b/config/module/coreboot/hppro3500series_8mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hppro3500series"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/kcma_d8_16mb/config/libgfxinit_txtmode b/config/module/coreboot/kcma_d8_16mb/config/libgfxinit_txtmode
index 39cfe811..39cfe811 100644
--- a/config/coreboot/kcma_d8_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kcma_d8_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kcma_d8_16mb/target.cfg b/config/module/coreboot/kcma_d8_16mb/target.cfg
index 75955f7e..bc86da22 100644
--- a/config/coreboot/kcma_d8_16mb/target.cfg
+++ b/config/module/coreboot/kcma_d8_16mb/target.cfg
@@ -5,8 +5,7 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode b/config/module/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode
index 7949bcfd..7949bcfd 100644
--- a/config/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kcma_d8_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kcma_d8_2mb/target.cfg b/config/module/coreboot/kcma_d8_2mb/target.cfg
index 75955f7e..bc86da22 100644
--- a/config/coreboot/kcma_d8_2mb/target.cfg
+++ b/config/module/coreboot/kcma_d8_2mb/target.cfg
@@ -5,8 +5,7 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode b/config/module/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode
index b538c0f9..b538c0f9 100644
--- a/config/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kfsn4_dre_1mb/target.cfg b/config/module/coreboot/kfsn4_dre_1mb/target.cfg
index c4536856..6699350f 100644
--- a/config/coreboot/kfsn4_dre_1mb/target.cfg
+++ b/config/module/coreboot/kfsn4_dre_1mb/target.cfg
@@ -4,6 +4,5 @@ tree="fam15h"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
-xlang="c"
-build_depend="seabios/default memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode b/config/module/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode
index a5329039..a5329039 100644
--- a/config/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kfsn4_dre_2mb/target.cfg b/config/module/coreboot/kfsn4_dre_2mb/target.cfg
index f942604b..63717af2 100644
--- a/config/coreboot/kfsn4_dre_2mb/target.cfg
+++ b/config/module/coreboot/kfsn4_dre_2mb/target.cfg
@@ -5,5 +5,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-xlang="c"
 payload_uboot="amd64"
diff --git a/config/coreboot/kgpe_d16_16mb/config/libgfxinit_txtmode b/config/module/coreboot/kgpe_d16_16mb/config/libgfxinit_txtmode
index c29a71f8..c29a71f8 100644
--- a/config/coreboot/kgpe_d16_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kgpe_d16_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kgpe_d16_16mb/target.cfg b/config/module/coreboot/kgpe_d16_16mb/target.cfg
index 75955f7e..bc86da22 100644
--- a/config/coreboot/kgpe_d16_16mb/target.cfg
+++ b/config/module/coreboot/kgpe_d16_16mb/target.cfg
@@ -5,8 +5,7 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/kgpe_d16_2mb/config/libgfxinit_txtmode b/config/module/coreboot/kgpe_d16_2mb/config/libgfxinit_txtmode
index 060966a5..060966a5 100644
--- a/config/coreboot/kgpe_d16_2mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/kgpe_d16_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kgpe_d16_2mb/target.cfg b/config/module/coreboot/kgpe_d16_2mb/target.cfg
index 75955f7e..bc86da22 100644
--- a/config/coreboot/kgpe_d16_2mb/target.cfg
+++ b/config/module/coreboot/kgpe_d16_2mb/target.cfg
@@ -5,8 +5,7 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/macbook11/config/libgfxinit_corebootfb b/config/module/coreboot/macbook11/config/libgfxinit_corebootfb
index 3d5b2d70..3d5b2d70 100644
--- a/config/coreboot/macbook11/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook11/config/libgfxinit_corebootfb
diff --git a/config/coreboot/macbook11/config/libgfxinit_txtmode b/config/module/coreboot/macbook11/config/libgfxinit_txtmode
index d6f79eb3..d6f79eb3 100644
--- a/config/coreboot/macbook11/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook11/config/libgfxinit_txtmode
diff --git a/config/coreboot/macbook11/target.cfg b/config/module/coreboot/macbook11/target.cfg
index f41e3fe9..f41e3fe9 100644
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/module/coreboot/macbook11/target.cfg
diff --git a/config/coreboot/macbook11_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
index a04478b5..a04478b5 100644
--- a/config/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/macbook11_16mb/config/libgfxinit_txtmode b/config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode
index 1f21453e..1f21453e 100644
--- a/config/coreboot/macbook11_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/module/coreboot/macbook11_16mb/target.cfg
index f41e3fe9..f41e3fe9 100644
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/module/coreboot/macbook11_16mb/target.cfg
diff --git a/config/coreboot/macbook21/config/libgfxinit_corebootfb b/config/module/coreboot/macbook21/config/libgfxinit_corebootfb
index 0311944f..0311944f 100644
--- a/config/coreboot/macbook21/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook21/config/libgfxinit_corebootfb
diff --git a/config/coreboot/macbook21/config/libgfxinit_txtmode b/config/module/coreboot/macbook21/config/libgfxinit_txtmode
index 2effc397..2effc397 100644
--- a/config/coreboot/macbook21/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook21/config/libgfxinit_txtmode
diff --git a/config/coreboot/macbook21/target.cfg b/config/module/coreboot/macbook21/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/module/coreboot/macbook21/target.cfg
diff --git a/config/coreboot/macbook21_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
index 728f3a4c..728f3a4c 100644
--- a/config/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/macbook21_16mb/config/libgfxinit_txtmode b/config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode
index 1b7bd6e2..1b7bd6e2 100644
--- a/config/coreboot/macbook21_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/module/coreboot/macbook21_16mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/module/coreboot/macbook21_16mb/target.cfg
diff --git a/config/coreboot/q45t_am/config/libgfxinit_txtmode b/config/module/coreboot/q45t_am/config/libgfxinit_txtmode
index 91d737e6..91d737e6 100644
--- a/config/coreboot/q45t_am/config/libgfxinit_txtmode
+++ b/config/module/coreboot/q45t_am/config/libgfxinit_txtmode
diff --git a/config/coreboot/q45t_am/target.cfg b/config/module/coreboot/q45t_am/target.cfg
index 357eee9a..df15ed4a 100644
--- a/config/coreboot/q45t_am/target.cfg
+++ b/config/module/coreboot/q45t_am/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb
index e2ea6bbd..e2ea6bbd 100644
--- a/config/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/module/coreboot/qemu_arm64_12mb/target.cfg
index 2ea9482f..2ea9482f 100644
--- a/config/coreboot/qemu_arm64_12mb/target.cfg
+++ b/config/module/coreboot/qemu_arm64_12mb/target.cfg
diff --git a/config/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
index 4e89cd40..4e89cd40 100644
--- a/config/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
index aa203151..aa203151 100644
--- a/config/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/module/coreboot/qemu_x86_12mb/target.cfg
index 476a98cb..d6a0a1bf 100644
--- a/config/coreboot/qemu_x86_12mb/target.cfg
+++ b/config/module/coreboot/qemu_x86_12mb/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
 payload_grub="y"
 payload_seabios="y"
 payload_memtest="y"
-build_depend="seabios/default grub/default memtest86plus u-boot/i386coreboot"
+build_depend="seabios/default grub/default memtest86plus/default u-boot/i386coreboot"
 payload_uboot="i386"
diff --git a/config/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb
index 4e89cd40..4e89cd40 100644
--- a/config/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode
index aa203151..aa203151 100644
--- a/config/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/qemu_x86_64_12mb/target.cfg b/config/module/coreboot/qemu_x86_64_12mb/target.cfg
index 61ae6299..61ae6299 100644
--- a/config/coreboot/qemu_x86_64_12mb/target.cfg
+++ b/config/module/coreboot/qemu_x86_64_12mb/target.cfg
diff --git a/config/coreboot/r400_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb
index e1a60e67..e1a60e67 100644
--- a/config/coreboot/r400_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/r400_16mb/config/libgfxinit_txtmode b/config/module/coreboot/r400_16mb/config/libgfxinit_txtmode
index 3afd76db..3afd76db 100644
--- a/config/coreboot/r400_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r400_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/r400_16mb/target.cfg b/config/module/coreboot/r400_16mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/module/coreboot/r400_16mb/target.cfg
diff --git a/config/coreboot/r400_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb
index 531da8f3..531da8f3 100644
--- a/config/coreboot/r400_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/r400_4mb/config/libgfxinit_txtmode b/config/module/coreboot/r400_4mb/config/libgfxinit_txtmode
index dbf59c2e..dbf59c2e 100644
--- a/config/coreboot/r400_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r400_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/r400_4mb/target.cfg b/config/module/coreboot/r400_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/module/coreboot/r400_4mb/target.cfg
diff --git a/config/coreboot/r400_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb
index a663af9e..a663af9e 100644
--- a/config/coreboot/r400_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/r400_8mb/config/libgfxinit_txtmode b/config/module/coreboot/r400_8mb/config/libgfxinit_txtmode
index 248ea5d4..248ea5d4 100644
--- a/config/coreboot/r400_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r400_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/r400_8mb/target.cfg b/config/module/coreboot/r400_8mb/target.cfg
index 23bfb335..23bfb335 100644
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/module/coreboot/r400_8mb/target.cfg
diff --git a/config/coreboot/r500_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb
index b55b3b21..b55b3b21 100644
--- a/config/coreboot/r500_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/r500_4mb/config/libgfxinit_txtmode b/config/module/coreboot/r500_4mb/config/libgfxinit_txtmode
index 0c2d75c3..0c2d75c3 100644
--- a/config/coreboot/r500_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r500_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/r500_4mb/target.cfg b/config/module/coreboot/r500_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/module/coreboot/r500_4mb/target.cfg
diff --git a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
index f2e45f3f..f2e45f3f 100644
--- a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
index e1de64a5..e1de64a5 100644
--- a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg
index 11058697..68754455 100644
--- a/config/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg
@@ -8,6 +8,6 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="supermicro_x11_lga1151_series"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 IFD_platform="sklkbl"
 payload_uboot="amd64"
diff --git a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode
index 7ec3336a..7ec3336a 100644
--- a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell7010sff_12mb/target.cfg b/config/module/coreboot/t1650_12mb/target.cfg
index 34865f86..2e3dfca9 100644
--- a/config/coreboot/dell7010sff_12mb/target.cfg
+++ b/config/module/coreboot/t1650_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="t1650"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/nvme default/memtest86plus u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb
index 6ec4b584..6ec4b584 100644
--- a/config/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode
index 7047d31d..7047d31d 100644
--- a/config/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t1700mt_bmrc_12mb/target.cfg b/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg
index a2d591d1..a8e6435e 100644
--- a/config/coreboot/t1700mt_bmrc_12mb/target.cfg
+++ b/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="t1700"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme default/memtest86plus u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb
index abd11500..abd11500 100644
--- a/config/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode
index 163f5aa8..163f5aa8 100644
--- a/config/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t1700sff_bmrc_12mb/target.cfg b/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg
index a2d591d1..d493ac48 100644
--- a/config/coreboot/t1700sff_bmrc_12mb/target.cfg
+++ b/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="t1700"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/t400_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb
index b938c5df..b938c5df 100644
--- a/config/coreboot/t400_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t400_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t400_16mb/config/libgfxinit_txtmode
index 3d8aa30d..3d8aa30d 100644
--- a/config/coreboot/t400_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t400_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t400_16mb/target.cfg b/config/module/coreboot/t400_16mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/module/coreboot/t400_16mb/target.cfg
diff --git a/config/coreboot/t400_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb
index ebdaad0f..ebdaad0f 100644
--- a/config/coreboot/t400_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t400_4mb/config/libgfxinit_txtmode b/config/module/coreboot/t400_4mb/config/libgfxinit_txtmode
index ef9d6931..ef9d6931 100644
--- a/config/coreboot/t400_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t400_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t400_4mb/target.cfg b/config/module/coreboot/t400_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/module/coreboot/t400_4mb/target.cfg
diff --git a/config/coreboot/t400_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb
index 05f13761..05f13761 100644
--- a/config/coreboot/t400_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t400_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t400_8mb/config/libgfxinit_txtmode
index bd0b113b..bd0b113b 100644
--- a/config/coreboot/t400_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t400_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t400_8mb/target.cfg b/config/module/coreboot/t400_8mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/module/coreboot/t400_8mb/target.cfg
diff --git a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb
index 0b8d3ff8..0b8d3ff8 100644
--- a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t420_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t420_8mb/config/libgfxinit_txtmode
index bc8c50c1..bc8c50c1 100644
--- a/config/coreboot/t420_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t420_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t420_8mb/target.cfg b/config/module/coreboot/t420_8mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/t420_8mb/target.cfg
+++ b/config/module/coreboot/t420_8mb/target.cfg
diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb
index 6ede06aa..6ede06aa 100644
--- a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode
index d34ed8d9..d34ed8d9 100644
--- a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/module/coreboot/t420s_8mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/t420s_8mb/target.cfg
+++ b/config/module/coreboot/t420s_8mb/target.cfg
diff --git a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb
index 4bbceba4..4bbceba4 100644
--- a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t430_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t430_12mb/config/libgfxinit_txtmode
index d5a85410..d5a85410 100644
--- a/config/coreboot/t430_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t430_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t430_12mb/target.cfg b/config/module/coreboot/t430_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/t430_12mb/target.cfg
+++ b/config/module/coreboot/t430_12mb/target.cfg
diff --git a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb
index e7e0e9a6..e7e0e9a6 100644
--- a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
index fef1423e..fef1423e 100644
--- a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/dell9020mt_nri_12mb/target.cfg b/config/module/coreboot/t440plibremrc_12mb/target.cfg
index 47e228b7..ddbbe740 100644
--- a/config/coreboot/dell9020mt_nri_12mb/target.cfg
+++ b/config/module/coreboot/t440plibremrc_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb
index 1b16e07e..1b16e07e 100644
--- a/config/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode
index 3877bc71..3877bc71 100644
--- a/config/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg
index 47e228b7..ddbbe740 100644
--- a/config/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg
+++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 payload_uboot="amd64"
diff --git a/config/coreboot/t480_vfsp_16mb/cbfs.cfg b/config/module/coreboot/t480_vfsp_16mb/cbfs.cfg
index 022783ff..022783ff 100644
--- a/config/coreboot/t480_vfsp_16mb/cbfs.cfg
+++ b/config/module/coreboot/t480_vfsp_16mb/cbfs.cfg
diff --git a/config/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb
index 9e54ced6..9e54ced6 100644
--- a/config/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode
index bcf90216..bcf90216 100644
--- a/config/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t480_vfsp_16mb/target.cfg b/config/module/coreboot/t480_vfsp_16mb/target.cfg
index 1cc6d167..bb709517 100644
--- a/config/coreboot/t480_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/t480_vfsp_16mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="t480"
-build_depend="seabios/default grub/xhci_nvme memtest86plus"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default"
 IFD_platform="sklkbl"
diff --git a/config/coreboot/t480s_vfsp_16mb/cbfs.cfg b/config/module/coreboot/t480s_vfsp_16mb/cbfs.cfg
index 022783ff..022783ff 100644
--- a/config/coreboot/t480s_vfsp_16mb/cbfs.cfg
+++ b/config/module/coreboot/t480s_vfsp_16mb/cbfs.cfg
diff --git a/config/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb
index 4ab99d81..4ab99d81 100644
--- a/config/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode
index 83f82021..83f82021 100644
--- a/config/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t480s_vfsp_16mb/target.cfg b/config/module/coreboot/t480s_vfsp_16mb/target.cfg
index a8fffe9a..089090c7 100644
--- a/config/coreboot/t480s_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/t480s_vfsp_16mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="t480s"
-build_depend="seabios/default grub/xhci_nvme memtest86plus"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default"
 IFD_platform="sklkbl"
diff --git a/config/coreboot/t500_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb
index bfc32e83..bfc32e83 100644
--- a/config/coreboot/t500_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t500_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t500_16mb/config/libgfxinit_txtmode
index bdfa38b7..bdfa38b7 100644
--- a/config/coreboot/t500_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t500_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t500_16mb/target.cfg b/config/module/coreboot/t500_16mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/module/coreboot/t500_16mb/target.cfg
diff --git a/config/coreboot/t500_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb
index 8e31d597..8e31d597 100644
--- a/config/coreboot/t500_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t500_4mb/config/libgfxinit_txtmode b/config/module/coreboot/t500_4mb/config/libgfxinit_txtmode
index 73e94c35..73e94c35 100644
--- a/config/coreboot/t500_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t500_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t500_4mb/target.cfg b/config/module/coreboot/t500_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/module/coreboot/t500_4mb/target.cfg
diff --git a/config/coreboot/t500_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb
index 4adddec3..4adddec3 100644
--- a/config/coreboot/t500_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t500_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t500_8mb/config/libgfxinit_txtmode
index 5dea57d4..5dea57d4 100644
--- a/config/coreboot/t500_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t500_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t500_8mb/target.cfg b/config/module/coreboot/t500_8mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/module/coreboot/t500_8mb/target.cfg
diff --git a/config/coreboot/t520_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb
index 78b4d81a..78b4d81a 100644
--- a/config/coreboot/t520_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t520_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t520_8mb/config/libgfxinit_txtmode
index 8c76c781..8c76c781 100644
--- a/config/coreboot/t520_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t520_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t520_8mb/target.cfg b/config/module/coreboot/t520_8mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/t520_8mb/target.cfg
+++ b/config/module/coreboot/t520_8mb/target.cfg
diff --git a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb
index bc88f1cc..bc88f1cc 100644
--- a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t530_12mb/config/libgfxinit_txtmode
index 77d56d1c..77d56d1c 100644
--- a/config/coreboot/t530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t530_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t530_12mb/target.cfg b/config/module/coreboot/t530_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/t530_12mb/target.cfg
+++ b/config/module/coreboot/t530_12mb/target.cfg
diff --git a/config/coreboot/t580_vfsp_16mb/cbfs.cfg b/config/module/coreboot/t580_vfsp_16mb/cbfs.cfg
index 022783ff..022783ff 100644
--- a/config/coreboot/t580_vfsp_16mb/cbfs.cfg
+++ b/config/module/coreboot/t580_vfsp_16mb/cbfs.cfg
diff --git a/config/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb
index f804f351..f804f351 100644
--- a/config/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode
index 7efba6e4..7efba6e4 100644
--- a/config/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/t580_vfsp_16mb/target.cfg b/config/module/coreboot/t580_vfsp_16mb/target.cfg
index 0a76f762..d4666113 100644
--- a/config/coreboot/t580_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/t580_vfsp_16mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="t580"
-build_depend="seabios/default grub/xhci_nvme memtest86plus"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default"
 IFD_platform="sklkbl"
diff --git a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
index 4f0c8888..4f0c8888 100644
--- a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
index f56378e6..f56378e6 100644
--- a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/module/coreboot/t60_16mb_intelgpu/target.cfg
index f41e3fe9..f41e3fe9 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/module/coreboot/t60_16mb_intelgpu/target.cfg
diff --git a/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
index 6d71869d..6d71869d 100644
--- a/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
diff --git a/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode
index 0b0007bb..0b0007bb 100644
--- a/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode
diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/module/coreboot/t60_intelgpu/target.cfg
index f41e3fe9..f41e3fe9 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/module/coreboot/t60_intelgpu/target.cfg
diff --git a/config/coreboot/w500_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb
index 57fb1fed..57fb1fed 100644
--- a/config/coreboot/w500_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/w500_16mb/config/libgfxinit_txtmode b/config/module/coreboot/w500_16mb/config/libgfxinit_txtmode
index 38f5544e..38f5544e 100644
--- a/config/coreboot/w500_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w500_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/w500_16mb/target.cfg b/config/module/coreboot/w500_16mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/module/coreboot/w500_16mb/target.cfg
diff --git a/config/coreboot/w500_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb
index 1c13017a..1c13017a 100644
--- a/config/coreboot/w500_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/w500_4mb/config/libgfxinit_txtmode b/config/module/coreboot/w500_4mb/config/libgfxinit_txtmode
index c1f0d7f8..c1f0d7f8 100644
--- a/config/coreboot/w500_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w500_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/w500_4mb/target.cfg b/config/module/coreboot/w500_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/module/coreboot/w500_4mb/target.cfg
diff --git a/config/coreboot/w500_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb
index 5008e50c..5008e50c 100644
--- a/config/coreboot/w500_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/w500_8mb/config/libgfxinit_txtmode b/config/module/coreboot/w500_8mb/config/libgfxinit_txtmode
index 9c5652f7..9c5652f7 100644
--- a/config/coreboot/w500_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w500_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/w500_8mb/target.cfg b/config/module/coreboot/w500_8mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/module/coreboot/w500_8mb/target.cfg
diff --git a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb
index 162bbee7..162bbee7 100644
--- a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/w530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/w530_12mb/config/libgfxinit_txtmode
index 10ccef36..10ccef36 100644
--- a/config/coreboot/w530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w530_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/w530_12mb/target.cfg b/config/module/coreboot/w530_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/w530_12mb/target.cfg
+++ b/config/module/coreboot/w530_12mb/target.cfg
diff --git a/config/coreboot/w541_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb
index 4f5a4c19..4f5a4c19 100644
--- a/config/coreboot/w541_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/w541_12mb/config/libgfxinit_txtmode b/config/module/coreboot/w541_12mb/config/libgfxinit_txtmode
index bfd839a9..bfd839a9 100644
--- a/config/coreboot/w541_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w541_12mb/config/libgfxinit_txtmode
diff --git a/config/module/coreboot/w541_12mb/target.cfg b/config/module/coreboot/w541_12mb/target.cfg
new file mode 100644
index 00000000..ddbbe740
--- /dev/null
+++ b/config/module/coreboot/w541_12mb/target.cfg
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+tree="default"
+xarch="i386-elf"
+payload_seabios="y"
+payload_grub="y"
+payload_memtest="y"
+grub_scan_disk="nvme ahci"
+grubtree="xhci_nvme"
+vcfg="haswell"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
+payload_uboot="amd64"
diff --git a/config/coreboot/x200_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb
index 445ca489..445ca489 100644
--- a/config/coreboot/x200_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x200_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x200_16mb/config/libgfxinit_txtmode
index d510df1c..d510df1c 100644
--- a/config/coreboot/x200_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x200_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x200_16mb/target.cfg b/config/module/coreboot/x200_16mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/module/coreboot/x200_16mb/target.cfg
diff --git a/config/coreboot/x200_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb
index 8fc2963f..8fc2963f 100644
--- a/config/coreboot/x200_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x200_4mb/config/libgfxinit_txtmode b/config/module/coreboot/x200_4mb/config/libgfxinit_txtmode
index ac21aac3..ac21aac3 100644
--- a/config/coreboot/x200_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x200_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x200_4mb/target.cfg b/config/module/coreboot/x200_4mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/module/coreboot/x200_4mb/target.cfg
diff --git a/config/coreboot/x200_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb
index 4d886d35..4d886d35 100644
--- a/config/coreboot/x200_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x200_8mb/config/libgfxinit_txtmode b/config/module/coreboot/x200_8mb/config/libgfxinit_txtmode
index eb397ccb..eb397ccb 100644
--- a/config/coreboot/x200_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x200_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x200_8mb/target.cfg b/config/module/coreboot/x200_8mb/target.cfg
index f4d81d19..f4d81d19 100644
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/module/coreboot/x200_8mb/target.cfg
diff --git a/config/coreboot/x220_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb
index 57c722ba..57c722ba 100644
--- a/config/coreboot/x220_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x220_8mb/config/libgfxinit_txtmode b/config/module/coreboot/x220_8mb/config/libgfxinit_txtmode
index e02a49ea..e02a49ea 100644
--- a/config/coreboot/x220_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x220_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x220_8mb/target.cfg b/config/module/coreboot/x220_8mb/target.cfg
index d7510b96..d7510b96 100644
--- a/config/coreboot/x220_8mb/target.cfg
+++ b/config/module/coreboot/x220_8mb/target.cfg
diff --git a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb
index e08ce188..e08ce188 100644
--- a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x230_12mb/config/libgfxinit_txtmode b/config/module/coreboot/x230_12mb/config/libgfxinit_txtmode
index 6c8fc9a6..6c8fc9a6 100644
--- a/config/coreboot/x230_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x230_12mb/target.cfg b/config/module/coreboot/x230_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/x230_12mb/target.cfg
+++ b/config/module/coreboot/x230_12mb/target.cfg
diff --git a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb
index 07236ae0..07236ae0 100644
--- a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x230_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x230_16mb/config/libgfxinit_txtmode
index 0ceb0743..0ceb0743 100644
--- a/config/coreboot/x230_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x230_16mb/target.cfg b/config/module/coreboot/x230_16mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/x230_16mb/target.cfg
+++ b/config/module/coreboot/x230_16mb/target.cfg
diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb
index bf74095e..bf74095e 100644
--- a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode b/config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode
index 29b62bdc..29b62bdc 100644
--- a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/module/coreboot/x230t_12mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/x230t_12mb/target.cfg
+++ b/config/module/coreboot/x230t_12mb/target.cfg
diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb
index 3f11a299..3f11a299 100644
--- a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode
index 3c2d69d6..3c2d69d6 100644
--- a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/module/coreboot/x230t_16mb/target.cfg
index 595ad782..595ad782 100644
--- a/config/coreboot/x230t_16mb/target.cfg
+++ b/config/module/coreboot/x230t_16mb/target.cfg
diff --git a/config/coreboot/x270_vfsp_16mb/cbfs.cfg b/config/module/coreboot/x270_vfsp_16mb/cbfs.cfg
index 022783ff..022783ff 100644
--- a/config/coreboot/x270_vfsp_16mb/cbfs.cfg
+++ b/config/module/coreboot/x270_vfsp_16mb/cbfs.cfg
diff --git a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb
index e71ad974..e71ad974 100644
--- a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode
index 02fdd0b6..02fdd0b6 100644
--- a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x270_vfsp_16mb/target.cfg b/config/module/coreboot/x270_vfsp_16mb/target.cfg
index a3323ba7..084b04ab 100644
--- a/config/coreboot/x270_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/x270_vfsp_16mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="x270"
-build_depend="seabios/default grub/xhci_nvme memtest86plus"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default"
 IFD_platform="sklkbl"
diff --git a/config/coreboot/x280_vfsp_16mb/cbfs.cfg b/config/module/coreboot/x280_vfsp_16mb/cbfs.cfg
index 022783ff..022783ff 100644
--- a/config/coreboot/x280_vfsp_16mb/cbfs.cfg
+++ b/config/module/coreboot/x280_vfsp_16mb/cbfs.cfg
diff --git a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb
index d76f768a..d76f768a 100644
--- a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode
index 465cd1a4..465cd1a4 100644
--- a/config/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x280_vfsp_16mb/target.cfg b/config/module/coreboot/x280_vfsp_16mb/target.cfg
index 344c3d0a..52a4ccca 100644
--- a/config/coreboot/x280_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/x280_vfsp_16mb/target.cfg
@@ -8,5 +8,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="x280"
-build_depend="seabios/default grub/xhci_nvme memtest86plus"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default"
 IFD_platform="sklkbl"
diff --git a/config/coreboot/x2e_n150/config/fspgop b/config/module/coreboot/x2e_n150/config/fspgop
index bcab6bbc..bcab6bbc 100644
--- a/config/coreboot/x2e_n150/config/fspgop
+++ b/config/module/coreboot/x2e_n150/config/fspgop
diff --git a/config/coreboot/x2e_n150/target.cfg b/config/module/coreboot/x2e_n150/target.cfg
index f2dc73e0..b76c8593 100644
--- a/config/coreboot/x2e_n150/target.cfg
+++ b/config/module/coreboot/x2e_n150/target.cfg
@@ -8,6 +8,6 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci_nvme"
 vcfg="x2e_n150"
-build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
 IFD_platform="adl"
 payload_uboot="amd64"
diff --git a/config/coreboot/x301_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb
index 45ffc1ea..45ffc1ea 100644
--- a/config/coreboot/x301_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x301_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x301_16mb/config/libgfxinit_txtmode
index 7c0c8a88..7c0c8a88 100644
--- a/config/coreboot/x301_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x301_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x301_16mb/target.cfg b/config/module/coreboot/x301_16mb/target.cfg
index 31e9f759..31e9f759 100644
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/module/coreboot/x301_16mb/target.cfg
diff --git a/config/coreboot/x301_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb
index 517632cc..517632cc 100644
--- a/config/coreboot/x301_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x301_4mb/config/libgfxinit_txtmode b/config/module/coreboot/x301_4mb/config/libgfxinit_txtmode
index e9604176..e9604176 100644
--- a/config/coreboot/x301_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x301_4mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x301_4mb/target.cfg b/config/module/coreboot/x301_4mb/target.cfg
index 31e9f759..31e9f759 100644
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/module/coreboot/x301_4mb/target.cfg
diff --git a/config/coreboot/x301_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb
index 639a0bbf..639a0bbf 100644
--- a/config/coreboot/x301_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x301_8mb/config/libgfxinit_txtmode b/config/module/coreboot/x301_8mb/config/libgfxinit_txtmode
index 0a3dfbed..0a3dfbed 100644
--- a/config/coreboot/x301_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x301_8mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x301_8mb/target.cfg b/config/module/coreboot/x301_8mb/target.cfg
index 31e9f759..31e9f759 100644
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/module/coreboot/x301_8mb/target.cfg
diff --git a/config/coreboot/x60/config/libgfxinit_corebootfb b/config/module/coreboot/x60/config/libgfxinit_corebootfb
index 1362daa1..1362daa1 100644
--- a/config/coreboot/x60/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x60/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x60/config/libgfxinit_txtmode b/config/module/coreboot/x60/config/libgfxinit_txtmode
index 784d02eb..784d02eb 100644
--- a/config/coreboot/x60/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x60/config/libgfxinit_txtmode
diff --git a/config/coreboot/x60/target.cfg b/config/module/coreboot/x60/target.cfg
index f41e3fe9..f41e3fe9 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/module/coreboot/x60/target.cfg
diff --git a/config/coreboot/x60_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb
index c8b78075..c8b78075 100644
--- a/config/coreboot/x60_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb
diff --git a/config/coreboot/x60_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x60_16mb/config/libgfxinit_txtmode
index 06b4c48e..06b4c48e 100644
--- a/config/coreboot/x60_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x60_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/x60_16mb/target.cfg b/config/module/coreboot/x60_16mb/target.cfg
index f41e3fe9..f41e3fe9 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/module/coreboot/x60_16mb/target.cfg
diff --git a/config/deguard/patches/0001-Replace-usr-bin-python3-with-usr-bin-env-python3.patch b/config/module/deguard/default/patches/0001-Replace-usr-bin-python3-with-usr-bin-env-python3.patch
index d5dc0dcc..d5dc0dcc 100644
--- a/config/deguard/patches/0001-Replace-usr-bin-python3-with-usr-bin-env-python3.patch
+++ b/config/module/deguard/default/patches/0001-Replace-usr-bin-python3-with-usr-bin-env-python3.patch
diff --git a/config/deguard/patches/0002-data-delta-Add-Dell-OptiPlex-5050-SFF.patch b/config/module/deguard/default/patches/0002-data-delta-Add-Dell-OptiPlex-5050-SFF.patch
index 11a19cd3..11a19cd3 100644
--- a/config/deguard/patches/0002-data-delta-Add-Dell-OptiPlex-5050-SFF.patch
+++ b/config/module/deguard/default/patches/0002-data-delta-Add-Dell-OptiPlex-5050-SFF.patch
diff --git a/config/deguard/patches/0003-lib-image.py-Disable-FPT-checksum-check.patch b/config/module/deguard/default/patches/0003-lib-image.py-Disable-FPT-checksum-check.patch
index 42bb05c1..42bb05c1 100644
--- a/config/deguard/patches/0003-lib-image.py-Disable-FPT-checksum-check.patch
+++ b/config/module/deguard/default/patches/0003-lib-image.py-Disable-FPT-checksum-check.patch
diff --git a/config/deguard/patches/0004-data-delta-Add-Supermicro-X11SSH-F-LN4F.patch b/config/module/deguard/default/patches/0004-data-delta-Add-Supermicro-X11SSH-F-LN4F.patch
index 1df8e16b..1df8e16b 100644
--- a/config/deguard/patches/0004-data-delta-Add-Supermicro-X11SSH-F-LN4F.patch
+++ b/config/module/deguard/default/patches/0004-data-delta-Add-Supermicro-X11SSH-F-LN4F.patch
diff --git a/config/deguard/patches/0005-data-delta-Add-Lenovo-Thinkpad-X270.patch b/config/module/deguard/default/patches/0005-data-delta-Add-Lenovo-Thinkpad-X270.patch
index b24161ee..b24161ee 100644
--- a/config/deguard/patches/0005-data-delta-Add-Lenovo-Thinkpad-X270.patch
+++ b/config/module/deguard/default/patches/0005-data-delta-Add-Lenovo-Thinkpad-X270.patch
diff --git a/config/deguard/patches/0006-data-delta-Add-Dell-OptiPlex-3040-Micro.patch b/config/module/deguard/default/patches/0006-data-delta-Add-Dell-OptiPlex-3040-Micro.patch
index ba1bb4b1..ba1bb4b1 100644
--- a/config/deguard/patches/0006-data-delta-Add-Dell-OptiPlex-3040-Micro.patch
+++ b/config/module/deguard/default/patches/0006-data-delta-Add-Dell-OptiPlex-3040-Micro.patch
diff --git a/config/git/deguard/pkg.cfg b/config/module/deguard/default/target.cfg
index ea93f186..dd077905 100644
--- a/config/git/deguard/pkg.cfg
+++ b/config/module/deguard/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="6f1221c936a1bed60c057883d231d48ef23c4fa9"
 url="https://codeberg.org/libreboot/deguard"
 bkup_url="https://review.coreboot.org/deguard"
+
+rev="6f1221c936a1bed60c057883d231d48ef23c4fa9"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/git/docs/pkg.cfg b/config/module/docs/default/target.cfg
index 83820858..553652d4 100644
--- a/config/git/docs/pkg.cfg
+++ b/config/module/docs/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="e4abe735ae13cf43e5da1d79fe63726ab01ac907"
 url="https://codeberg.org/libreboot/lbssg"
 bkup_url="https://notabug.org/libreboot/lbssg"
+
+rev="e4abe735ae13cf43e5da1d79fe63726ab01ac907"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/flashprog/patches/0001-Workaround-for-MX25-chips.patch b/config/module/flashprog/default/patches/0001-Workaround-for-MX25-chips.patch
index 77c05577..77c05577 100644
--- a/config/flashprog/patches/0001-Workaround-for-MX25-chips.patch
+++ b/config/module/flashprog/default/patches/0001-Workaround-for-MX25-chips.patch
diff --git a/config/flashprog/patches/0002-lbmk-hack-add-config-Makefile-options.patch b/config/module/flashprog/default/patches/0002-lbmk-hack-add-config-Makefile-options.patch
index 15fc0916..15fc0916 100644
--- a/config/flashprog/patches/0002-lbmk-hack-add-config-Makefile-options.patch
+++ b/config/module/flashprog/default/patches/0002-lbmk-hack-add-config-Makefile-options.patch
diff --git a/config/git/flashprog/pkg.cfg b/config/module/flashprog/default/target.cfg
index d5f2b6c9..57860839 100644
--- a/config/git/flashprog/pkg.cfg
+++ b/config/module/flashprog/default/target.cfg
@@ -1,5 +1,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="ffcf92fbfd04a3ac1a5d882bcd5c4b78255af495"
 url="https://review.sourcearcade.org/flashprog"
 bkup_url="https://github.com/SourceArcade/flashprog.git"
+
+rev="ffcf92fbfd04a3ac1a5d882bcd5c4b78255af495"
+
+tree="default"
+
+makeargs="WARNERROR=no"
+
+noconfig="y"
diff --git a/config/git/gpio-scripts/pkg.cfg b/config/module/gpio-scripts/default/target.cfg
index be491070..d072e3cf 100644
--- a/config/git/gpio-scripts/pkg.cfg
+++ b/config/module/gpio-scripts/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="be2de1233a70e3cf05ad17b008fd85c862b1ecf9"
 url="https://codeberg.org/libreboot/gpio-scripts"
 bkup_url="https://git.disroot.org/libreboot/gpio-scripts"
+
+rev="be2de1233a70e3cf05ad17b008fd85c862b1ecf9"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/grub/default/config/payload b/config/module/grub/default/config/payload
index 3d84413e..3d84413e 100644
--- a/config/grub/default/config/payload
+++ b/config/module/grub/default/config/payload
diff --git a/config/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
index 7112b0aa..7112b0aa 100644
--- a/config/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ b/config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
diff --git a/config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
index af139ffc..af139ffc 100644
--- a/config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
diff --git a/config/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
index bb07abd6..bb07abd6 100644
--- a/config/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
+++ b/config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
diff --git a/config/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch b/config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
index fbcbb2c3..fbcbb2c3 100644
--- a/config/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
+++ b/config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
diff --git a/config/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
index 93b0c505..93b0c505 100644
--- a/config/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
+++ b/config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
diff --git a/config/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch b/config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch
index 2dbf6d87..2dbf6d87 100644
--- a/config/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch
+++ b/config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch
diff --git a/config/grub/default/patches/0007-don-t-print-empty-error-messages.patch b/config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch
index 67ae7d66..67ae7d66 100644
--- a/config/grub/default/patches/0007-don-t-print-empty-error-messages.patch
+++ b/config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch
diff --git a/config/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch b/config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch
index 7ce1bf09..7ce1bf09 100644
--- a/config/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch
+++ b/config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch
diff --git a/config/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch b/config/module/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch
index 9bb2563d..9bb2563d 100644
--- a/config/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch
+++ b/config/module/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch
diff --git a/config/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/config/module/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
index 0c968993..0c968993 100644
--- a/config/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ b/config/module/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
diff --git a/config/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch b/config/module/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch
index cfb66047..cfb66047 100644
--- a/config/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch
+++ b/config/module/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch
diff --git a/config/grub/default/target.cfg b/config/module/grub/default/target.cfg
index 2ce61fff..cfa2a287 100644
--- a/config/grub/default/target.cfg
+++ b/config/module/grub/default/target.cfg
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="default"
 rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
+
+tree="default"
diff --git a/config/grub/nvme/config/payload b/config/module/grub/nvme/config/payload
index 4f3de36e..4f3de36e 100644
--- a/config/grub/nvme/config/payload
+++ b/config/module/grub/nvme/config/payload
diff --git a/config/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/module/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
index 41194e98..41194e98 100644
--- a/config/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ b/config/module/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
diff --git a/config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/module/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
index 359f31f8..359f31f8 100644
--- a/config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/module/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
diff --git a/config/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/module/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
index ab26c6b2..ab26c6b2 100644
--- a/config/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
+++ b/config/module/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
diff --git a/config/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch b/config/module/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
index 68dfb2f7..68dfb2f7 100644
--- a/config/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
+++ b/config/module/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
diff --git a/config/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/module/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
index 53dbdd87..53dbdd87 100644
--- a/config/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
+++ b/config/module/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
diff --git a/config/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch b/config/module/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch
index 3851c7fe..3851c7fe 100644
--- a/config/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch
+++ b/config/module/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch
diff --git a/config/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch b/config/module/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch
index aa42420f..aa42420f 100644
--- a/config/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch
+++ b/config/module/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch
diff --git a/config/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch b/config/module/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch
index e0b40f2f..e0b40f2f 100644
--- a/config/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch
+++ b/config/module/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch
diff --git a/config/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch b/config/module/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch
index 11b82429..11b82429 100644
--- a/config/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch
+++ b/config/module/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch
diff --git a/config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch b/config/module/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch
index 8e78e8b7..8e78e8b7 100644
--- a/config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch
+++ b/config/module/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch
diff --git a/config/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/config/module/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
index c0a504ff..c0a504ff 100644
--- a/config/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ b/config/module/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
diff --git a/config/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch b/config/module/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch
index cfb66047..cfb66047 100644
--- a/config/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch
+++ b/config/module/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch
diff --git a/config/grub/nvme/target.cfg b/config/module/grub/nvme/target.cfg
index e2a67cc0..15102b28 100644
--- a/config/grub/nvme/target.cfg
+++ b/config/module/grub/nvme/target.cfg
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="nvme"
 rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
+
+tree="nvme"
diff --git a/config/grub/xhci_nvme/config/payload b/config/module/grub/xhci_nvme/config/payload
index 9db22fe2..9db22fe2 100644
--- a/config/grub/xhci_nvme/config/payload
+++ b/config/module/grub/xhci_nvme/config/payload
diff --git a/config/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/module/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
index 7f489819..7f489819 100644
--- a/config/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ b/config/module/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
diff --git a/config/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/module/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
index fdf97c16..fdf97c16 100644
--- a/config/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/module/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
diff --git a/config/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/module/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
index 3e6d9203..3e6d9203 100644
--- a/config/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
+++ b/config/module/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
diff --git a/config/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch b/config/module/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
index 0fdcaac7..0fdcaac7 100644
--- a/config/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
+++ b/config/module/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
diff --git a/config/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/module/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
index cec589e1..cec589e1 100644
--- a/config/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
+++ b/config/module/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
diff --git a/config/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch b/config/module/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch
index afffefca..afffefca 100644
--- a/config/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch
+++ b/config/module/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch
diff --git a/config/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch b/config/module/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch
index 44a9c432..44a9c432 100644
--- a/config/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch
+++ b/config/module/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch
diff --git a/config/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch b/config/module/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch
index 95e9fb7b..95e9fb7b 100644
--- a/config/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch
+++ b/config/module/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch
diff --git a/config/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch b/config/module/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch
index 5b79d33c..5b79d33c 100644
--- a/config/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch
+++ b/config/module/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch
diff --git a/config/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch b/config/module/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch
index c6196f87..c6196f87 100644
--- a/config/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch
+++ b/config/module/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch
diff --git a/config/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch b/config/module/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch
index ac53118a..ac53118a 100644
--- a/config/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch
+++ b/config/module/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch
diff --git a/config/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch b/config/module/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch
index fbedfc77..fbedfc77 100644
--- a/config/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch
+++ b/config/module/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch
diff --git a/config/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch b/config/module/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch
index 1393092a..1393092a 100644
--- a/config/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch
+++ b/config/module/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch
diff --git a/config/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch b/config/module/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch
index bb5c4fd8..bb5c4fd8 100644
--- a/config/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch
+++ b/config/module/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch
diff --git a/config/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch b/config/module/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch
index 9deb581d..9deb581d 100644
--- a/config/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch
+++ b/config/module/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch
diff --git a/config/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch b/config/module/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch
index b1cb368a..b1cb368a 100644
--- a/config/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch
+++ b/config/module/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch
diff --git a/config/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch b/config/module/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch
index fb8ed0b4..fb8ed0b4 100644
--- a/config/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch
+++ b/config/module/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch
diff --git a/config/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch b/config/module/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch
index 70a1a22c..70a1a22c 100644
--- a/config/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch
+++ b/config/module/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch
diff --git a/config/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch b/config/module/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch
index f09ae69d..f09ae69d 100644
--- a/config/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch
+++ b/config/module/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch
diff --git a/config/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch b/config/module/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch
index ffa01e7a..ffa01e7a 100644
--- a/config/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch
+++ b/config/module/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch
diff --git a/config/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch b/config/module/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch
index 0e563fd5..0e563fd5 100644
--- a/config/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch
+++ b/config/module/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch
diff --git a/config/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/config/module/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
index c0a504ff..c0a504ff 100644
--- a/config/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ b/config/module/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
diff --git a/config/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch b/config/module/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch
index cfb66047..cfb66047 100644
--- a/config/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch
+++ b/config/module/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch
diff --git a/config/grub/xhci_nvme/target.cfg b/config/module/grub/xhci_nvme/target.cfg
index 15e3e00e..07d65c91 100644
--- a/config/grub/xhci_nvme/target.cfg
+++ b/config/module/grub/xhci_nvme/target.cfg
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="xhci_nvme"
 rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
+
+tree="xhci_nvme"
diff --git a/config/git/int/pkg.cfg b/config/module/int/default/target.cfg
index 367acc9b..2f71f974 100644
--- a/config/git/int/pkg.cfg
+++ b/config/module/int/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="d1ac570549f00477d9ade21807f42f28a4864fcd"
 url="https://codeberg.org/libreboot/int"
 bkup_url="https://git.disroot.org/libreboot/int"
+
+rev="d1ac570549f00477d9ade21807f42f28a4864fcd"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/git/libarchive/pkg.cfg b/config/module/libarchive/default/target.cfg
index afce5b26..e5302d6b 100644
--- a/config/git/libarchive/pkg.cfg
+++ b/config/module/libarchive/default/target.cfg
@@ -1,5 +1,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="9525f90ca4bd14c7b335e2f8c84a4607b0af6bdf"
 url="https://codeberg.org/libreboot/libarchive"
 bkup_url="https://git.disroot.org/libreboot/libarchive"
+
+rev="9525f90ca4bd14c7b335e2f8c84a4607b0af6bdf"
+
+tree="default"
+
+premake="eval autoreconf -fiv \"src/libarchive/$tree\""
+
+noconfig="y"
diff --git a/config/me_cleaner/patches/0001-Add-a-p-option-skip-FPTR-checks.patch b/config/module/me_cleaner/default/patches/0001-Add-a-p-option-skip-FPTR-checks.patch
index 0689f0a6..0689f0a6 100644
--- a/config/me_cleaner/patches/0001-Add-a-p-option-skip-FPTR-checks.patch
+++ b/config/module/me_cleaner/default/patches/0001-Add-a-p-option-skip-FPTR-checks.patch
diff --git a/config/git/me_cleaner/pkg.cfg b/config/module/me_cleaner/default/target.cfg
index 8a09d9c3..7372a886 100644
--- a/config/git/me_cleaner/pkg.cfg
+++ b/config/module/me_cleaner/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="f20532d90378120b1ed2e710cecb36505cc70c31"
 url="https://codeberg.org/libreboot/me_cleaner"
 bkup_url="https://git.disroot.org/libreboot/me_cleaner"
+
+rev="f20532d90378120b1ed2e710cecb36505cc70c31"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch b/config/module/memtest86plus/default/patches/0001-add-central-Makefile-in-main-directory.patch
index 8291bfb8..8291bfb8 100644
--- a/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch
+++ b/config/module/memtest86plus/default/patches/0001-add-central-Makefile-in-main-directory.patch
diff --git a/config/git/memtest86plus/pkg.cfg b/config/module/memtest86plus/default/target.cfg
index 07887ab7..8f57b322 100644
--- a/config/git/memtest86plus/pkg.cfg
+++ b/config/module/memtest86plus/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="5dcd424ea7afb857c1171e747ef064d98d26afeb"
 url="https://codeberg.org/libreboot/memtest86plus"
 bkup_url="https://github.com/memtest86plus/memtest86plus.git"
+
+rev="5dcd424ea7afb857c1171e747ef064d98d26afeb"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/git/mxmdump/pkg.cfg b/config/module/mxmdump/default/target.cfg
index 792a7cfd..f8657e1b 100644
--- a/config/git/mxmdump/pkg.cfg
+++ b/config/module/mxmdump/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="ab3393c84fd3de01793bbfa2ec4caddfe0dc44f6"
 url="https://codeberg.org/libreboot/mxmdump"
 bkup_url="https://git.disroot.org/libreboot/mxmdump"
+
+rev="ab3393c84fd3de01793bbfa2ec4caddfe0dc44f6"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/pcsx-redux/patches/0001-no-context-will-be-given.patch b/config/module/pcsx-redux/default/patches/0001-no-context-will-be-given.patch
index b2968c11..b2968c11 100644
--- a/config/pcsx-redux/patches/0001-no-context-will-be-given.patch
+++ b/config/module/pcsx-redux/default/patches/0001-no-context-will-be-given.patch
diff --git a/config/pcsx-redux/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch b/config/module/pcsx-redux/default/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch
index 1a495d60..1a495d60 100644
--- a/config/pcsx-redux/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch
+++ b/config/module/pcsx-redux/default/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch
diff --git a/config/git/pcsx-redux/pkg.cfg b/config/module/pcsx-redux/default/target.cfg
index 5456d98b..b7245977 100644
--- a/config/git/pcsx-redux/pkg.cfg
+++ b/config/module/pcsx-redux/default/target.cfg
@@ -1,5 +1,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="b745534eb231d3699ec57949f16a9a7bd5b79385"
 url="https://github.com/grumpycoders/pcsx-redux"
 bkup_url="https://codeberg.org/vimuser/pcsx-redux"
+
+rev="b745534eb231d3699ec57949f16a9a7bd5b79385"
+
+tree="default"
+
+makeargs="-f lbmkbofhmakefile"
+cleanargs="-f lbmkbofhmakefile"
+
+noconfig="y"
diff --git a/config/pico-sdk/patches/0001-Fix-GCC14.1-compile-error-in-w25x10cls.S-2000.patch b/config/module/pico-sdk/default/patches/0001-Fix-GCC14.1-compile-error-in-w25x10cls.S-2000.patch
index c52e701d..c52e701d 100644
--- a/config/pico-sdk/patches/0001-Fix-GCC14.1-compile-error-in-w25x10cls.S-2000.patch
+++ b/config/module/pico-sdk/default/patches/0001-Fix-GCC14.1-compile-error-in-w25x10cls.S-2000.patch
diff --git a/config/git/pico-sdk/pkg.cfg b/config/module/pico-sdk/default/target.cfg
index 284ee057..ef371a19 100644
--- a/config/git/pico-sdk/pkg.cfg
+++ b/config/module/pico-sdk/default/target.cfg
@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="6a7db34ff63345a7badec79ebea3aaef1712f374"
 url="https://codeberg.org/libreboot/pico-sdk"
 bkup_url="https://github.com/raspberrypi/pico-sdk"
+
+rev="6a7db34ff63345a7badec79ebea3aaef1712f374"
+
+tree="default"
+
+noconfig="y"
diff --git a/config/module/pico-serprog/default/target.cfg b/config/module/pico-serprog/default/target.cfg
new file mode 100644
index 00000000..98767c13
--- /dev/null
+++ b/config/module/pico-serprog/default/target.cfg
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+fetch_depend="pico-sdk/default"
+
+url="https://codeberg.org/libreboot/pico-serprog"
+bkup_url="https://git.disroot.org/libreboot/pico-serprog"
+
+rev="3ea792664ed29ca1ff3e2e78d1d16099684781bd"
+
+tree="default"
+
+sersrc="src/pico-serprog/$tree"
+serx="$sersrc/build/pico_serprog.uf2"
+picosdk="src/pico-sdk/$tree"
+serdir="$picosdk/src/boards/include/boards"
+premake="$if_not_dry_build eval fx_ \"buildser pico\" x_ basename -as .h \"\$serdir/\"*.h"
+
+noconfig="y"
diff --git a/config/seabios/default/config/libgfxinit b/config/module/seabios/default/config/libgfxinit
index f1f4b0a6..f1f4b0a6 100644
--- a/config/seabios/default/config/libgfxinit
+++ b/config/module/seabios/default/config/libgfxinit
diff --git a/config/seabios/default/config/normal b/config/module/seabios/default/config/normal
index 187a7501..187a7501 100644
--- a/config/seabios/default/config/normal
+++ b/config/module/seabios/default/config/normal
diff --git a/config/seabios/default/config/vgarom b/config/module/seabios/default/config/vgarom
index 9e63e65c..9e63e65c 100644
--- a/config/seabios/default/config/vgarom
+++ b/config/module/seabios/default/config/vgarom
diff --git a/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch b/config/module/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch
index c7925ecb..c7925ecb 100644
--- a/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch
+++ b/config/module/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch
diff --git a/config/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch b/config/module/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch
index c1400f64..c1400f64 100644
--- a/config/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch
+++ b/config/module/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch
diff --git a/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch b/config/module/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch
index aee850c5..aee850c5 100644
--- a/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch
+++ b/config/module/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch
diff --git a/config/git/seabios/pkg.cfg b/config/module/seabios/default/target.cfg
index 4280c6fd..1307aa88 100644
--- a/config/git/seabios/pkg.cfg
+++ b/config/module/seabios/default/target.cfg
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="HEAD"
 url="https://github.com/coreboot/seabios"
 bkup_url="https://review.coreboot.org/seabios"
+
+rev="0026c353eb4e220af29750fcf000d48faf8d4ab3"
+
+tree="default"
diff --git a/config/module/stm32-vserprog/default/target.cfg b/config/module/stm32-vserprog/default/target.cfg
new file mode 100644
index 00000000..94fb68e0
--- /dev/null
+++ b/config/module/stm32-vserprog/default/target.cfg
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+url="https://codeberg.org/libreboot/stm32-vserprog"
+bkup_url="https://git.disroot.org/libreboot/stm32-vserprog"
+
+rev="8fcf0a4d41800631b571fa7bbd1d8b251f0a2111"
+
+tree="default"
+
+sersrc="src/stm32-vserprog/$tree"
+serx="$sersrc/stm32-vserprog.hex"
+serdir="$sersrc/boards"
+mkhelper="$if_not_dry_build eval fx_ \"buildser stm32\" x_ basename -as .h \"\$serdir/\"*.h"
+
+noconfig="y"
diff --git a/config/u-boot/amd64coreboot/config/default b/config/module/u-boot/amd64coreboot/config/default
index 7c2a45f0..7c2a45f0 100644
--- a/config/u-boot/amd64coreboot/config/default
+++ b/config/module/u-boot/amd64coreboot/config/default
diff --git a/config/flashprog/target.cfg b/config/module/u-boot/amd64coreboot/target.cfg
index 2d9243b7..898650ed 100644
--- a/config/flashprog/target.cfg
+++ b/config/module/u-boot/amd64coreboot/target.cfg
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-makeargs="WARNERROR=no"
+tree="x86_64"
diff --git a/config/u-boot/default/nuke.list b/config/module/u-boot/default/nuke.list
index f3a3fcc3..f3a3fcc3 100644
--- a/config/u-boot/default/nuke.list
+++ b/config/module/u-boot/default/nuke.list
diff --git a/config/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch b/config/module/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch
index 8227b076..8227b076 100644
--- a/config/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch
+++ b/config/module/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch
diff --git a/config/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch b/config/module/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch
index e2de311c..e2de311c 100644
--- a/config/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch
+++ b/config/module/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch
diff --git a/config/u-boot/default/patches/0003-Add-video-damage-tracking.patch b/config/module/u-boot/default/patches/0003-Add-video-damage-tracking.patch
index 18c93ab8..18c93ab8 100644
--- a/config/u-boot/default/patches/0003-Add-video-damage-tracking.patch
+++ b/config/module/u-boot/default/patches/0003-Add-video-damage-tracking.patch
diff --git a/config/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch b/config/module/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch
index 5307f378..5307f378 100644
--- a/config/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch
+++ b/config/module/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch
diff --git a/config/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch b/config/module/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch
index 018da338..018da338 100644
--- a/config/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch
+++ b/config/module/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch
diff --git a/config/u-boot/default/patches/0006-Support-auto-boot-timeout-delay-bootflow-menu.patch b/config/module/u-boot/default/patches/0006-Support-auto-boot-timeout-delay-bootflow-menu.patch
index ffc7b581..ffc7b581 100644
--- a/config/u-boot/default/patches/0006-Support-auto-boot-timeout-delay-bootflow-menu.patch
+++ b/config/module/u-boot/default/patches/0006-Support-auto-boot-timeout-delay-bootflow-menu.patch
diff --git a/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/module/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch
index ec033187..ec033187 100644
--- a/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ b/config/module/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch
diff --git a/config/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch b/config/module/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch
index 8ddf398c..8ddf398c 100644
--- a/config/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch
+++ b/config/module/u-boot/default/patches/0008-u-boot-fix-build-error-on-newer-hostcc.patch
diff --git a/config/u-boot/default/target.cfg b/config/module/u-boot/default/target.cfg
index f3c856d4..3fcb54b7 100644
--- a/config/u-boot/default/target.cfg
+++ b/config/module/u-boot/default/target.cfg
@@ -1,4 +1,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="default"
 rev="34820924edbc4ec7803eb89d9852f4b870fa760a" # v2025.04
+
+tree="default"
+
+xgcctree="default"
+fetch_depend="coreboot/default"
diff --git a/config/u-boot/gru_bob/config/default b/config/module/u-boot/gru_bob/config/default
index f6894b52..f6894b52 100644
--- a/config/u-boot/gru_bob/config/default
+++ b/config/module/u-boot/gru_bob/config/default
diff --git a/config/u-boot/gru_kevin/target.cfg b/config/module/u-boot/gru_bob/target.cfg
index 0c90e338..50080091 100644
--- a/config/u-boot/gru_kevin/target.cfg
+++ b/config/module/u-boot/gru_bob/target.cfg
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 tree="default"
-xgcctree="default"
 xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/gru_kevin/config/default b/config/module/u-boot/gru_kevin/config/default
index 582c51f9..582c51f9 100644
--- a/config/u-boot/gru_kevin/config/default
+++ b/config/module/u-boot/gru_kevin/config/default
diff --git a/config/u-boot/gru_bob/target.cfg b/config/module/u-boot/gru_kevin/target.cfg
index 0c90e338..50080091 100644
--- a/config/u-boot/gru_bob/target.cfg
+++ b/config/module/u-boot/gru_kevin/target.cfg
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 tree="default"
-xgcctree="default"
 xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/i386coreboot/config/default b/config/module/u-boot/i386coreboot/config/default
index 32e41bba..32e41bba 100644
--- a/config/u-boot/i386coreboot/config/default
+++ b/config/module/u-boot/i386coreboot/config/default
diff --git a/config/uefitool/target.cfg b/config/module/u-boot/i386coreboot/target.cfg
index 9dfb2543..40b0013e 100644
--- a/config/uefitool/target.cfg
+++ b/config/module/u-boot/i386coreboot/target.cfg
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-cmakedir="UEFIExtract"
-buildtype="cmake"
+tree="x86"
diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/module/u-boot/qemu_arm64_12mb/config/default
index 2cd0b94c..2cd0b94c 100644
--- a/config/u-boot/qemu_arm64_12mb/config/default
+++ b/config/module/u-boot/qemu_arm64_12mb/config/default
diff --git a/config/u-boot/qemu_arm64_12mb/target.cfg b/config/module/u-boot/qemu_arm64_12mb/target.cfg
index 0c90e338..50080091 100644
--- a/config/u-boot/qemu_arm64_12mb/target.cfg
+++ b/config/module/u-boot/qemu_arm64_12mb/target.cfg
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 tree="default"
-xgcctree="default"
 xarch="aarch64-elf arm-eabi"
diff --git a/config/u-boot/x86/nuke.list b/config/module/u-boot/x86/nuke.list
index f3a3fcc3..f3a3fcc3 100644
--- a/config/u-boot/x86/nuke.list
+++ b/config/module/u-boot/x86/nuke.list
diff --git a/config/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch b/config/module/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
index e3969d03..e3969d03 100644
--- a/config/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
+++ b/config/module/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
diff --git a/config/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
index 7fb75772..7fb75772 100644
--- a/config/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
+++ b/config/module/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
diff --git a/config/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
index bb33d6fd..bb33d6fd 100644
--- a/config/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
+++ b/config/module/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
diff --git a/config/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch b/config/module/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
index ffc7b581..ffc7b581 100644
--- a/config/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
+++ b/config/module/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
diff --git a/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/module/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
index ec033187..ec033187 100644
--- a/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ b/config/module/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
diff --git a/config/u-boot/x86/patches/0006-i-made-it-purple.patch b/config/module/u-boot/x86/patches/0006-i-made-it-purple.patch
index 594a1b35..594a1b35 100644
--- a/config/u-boot/x86/patches/0006-i-made-it-purple.patch
+++ b/config/module/u-boot/x86/patches/0006-i-made-it-purple.patch
diff --git a/config/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/config/module/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
index 905b311c..905b311c 100644
--- a/config/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
+++ b/config/module/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
diff --git a/config/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch b/config/module/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
index ac34a03d..ac34a03d 100644
--- a/config/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
+++ b/config/module/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
diff --git a/config/u-boot/x86/target.cfg b/config/module/u-boot/x86/target.cfg
index bf19e4a5..dec79f53 100644
--- a/config/u-boot/x86/target.cfg
+++ b/config/module/u-boot/x86/target.cfg
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="x86"
 rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10
+
+tree="x86"
diff --git a/config/u-boot/x86_64/nuke.list b/config/module/u-boot/x86_64/nuke.list
index f3a3fcc3..f3a3fcc3 100644
--- a/config/u-boot/x86_64/nuke.list
+++ b/config/module/u-boot/x86_64/nuke.list
diff --git a/config/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch b/config/module/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
index e3969d03..e3969d03 100644
--- a/config/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
+++ b/config/module/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
diff --git a/config/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
index 7fb75772..7fb75772 100644
--- a/config/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
+++ b/config/module/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
diff --git a/config/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
index bb33d6fd..bb33d6fd 100644
--- a/config/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
+++ b/config/module/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
diff --git a/config/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch b/config/module/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
index ffc7b581..ffc7b581 100644
--- a/config/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
+++ b/config/module/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
diff --git a/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/module/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
index ec033187..ec033187 100644
--- a/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ b/config/module/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
diff --git a/config/u-boot/x86_64/patches/0006-i-made-it-purple.patch b/config/module/u-boot/x86_64/patches/0006-i-made-it-purple.patch
index 594a1b35..594a1b35 100644
--- a/config/u-boot/x86_64/patches/0006-i-made-it-purple.patch
+++ b/config/module/u-boot/x86_64/patches/0006-i-made-it-purple.patch
diff --git a/config/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/config/module/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
index 905b311c..905b311c 100644
--- a/config/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
+++ b/config/module/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
diff --git a/config/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch b/config/module/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
index 50b9ca0b..50b9ca0b 100644
--- a/config/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
+++ b/config/module/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
diff --git a/config/u-boot/x86_64/target.cfg b/config/module/u-boot/x86_64/target.cfg
index a1e15d12..b9732813 100644
--- a/config/u-boot/x86_64/target.cfg
+++ b/config/module/u-boot/x86_64/target.cfg
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-tree="x86_64"
 rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10
+
+tree="x86_64"
diff --git a/config/git/uefitool/pkg.cfg b/config/module/uefitool/default/target.cfg
index f972acb2..c10e5702 100644
--- a/config/git/uefitool/pkg.cfg
+++ b/config/module/uefitool/default/target.cfg
@@ -1,5 +1,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-rev="a072527138637a0e2808ad1544a02d187ab1ed79"
 url="https://codeberg.org/libreboot/UEFITool"
 bkup_url="https://github.com/LongSoft/UEFITool"
+
+rev="a072527138637a0e2808ad1544a02d187ab1ed79"
+
+tree="default"
+
+cmakedir="UEFIExtract"
+
+noconfig="y"
diff --git a/config/pcsx-redux/target.cfg b/config/pcsx-redux/target.cfg
deleted file mode 100644
index b30c144f..00000000
--- a/config/pcsx-redux/target.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-makeargs="-f lbmkbofhmakefile"
-cleanargs="-f lbmkbofhmakefile"
diff --git a/config/seabios/default/target.cfg b/config/seabios/default/target.cfg
deleted file mode 100644
index 78cfc9e2..00000000
--- a/config/seabios/default/target.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-tree="default"
-rev="0026c353eb4e220af29750fcf000d48faf8d4ab3"
diff --git a/config/data/coreboot/0 b/config/snippet/0
index f76dd238..f76dd238 100644
--- a/config/data/coreboot/0
+++ b/config/snippet/0
diff --git a/config/snippet/1 b/config/snippet/1
new file mode 100644
index 00000000..6b2aaa76
--- /dev/null
+++ b/config/snippet/1
@@ -0,0 +1 @@
+

\ No newline at end of file
diff --git a/config/submodule/docs/html/module.cfg b/config/submodule/docs/default/html/module.cfg
index e18b2fe4..e18b2fe4 100644
--- a/config/submodule/docs/html/module.cfg
+++ b/config/submodule/docs/default/html/module.cfg
diff --git a/config/submodule/docs/img/module.cfg b/config/submodule/docs/default/img/module.cfg
index 8a176668..8a176668 100644
--- a/config/submodule/docs/img/module.cfg
+++ b/config/submodule/docs/default/img/module.cfg
diff --git a/config/submodule/docs/module.list b/config/submodule/docs/default/module.list
index e2570aac..e2570aac 100644
--- a/config/submodule/docs/module.list
+++ b/config/submodule/docs/default/module.list
diff --git a/config/submodule/pcsx-redux/module.list b/config/submodule/pcsx-redux/default/module.list
index 9b1f70ee..9b1f70ee 100644
--- a/config/submodule/pcsx-redux/module.list
+++ b/config/submodule/pcsx-redux/default/module.list
diff --git a/config/submodule/pcsx-redux/uC-sdk/module.cfg b/config/submodule/pcsx-redux/default/uC-sdk/module.cfg
index 75f68204..75f68204 100644
--- a/config/submodule/pcsx-redux/uC-sdk/module.cfg
+++ b/config/submodule/pcsx-redux/default/uC-sdk/module.cfg
diff --git a/config/submodule/pico-sdk/module.list b/config/submodule/pico-sdk/default/module.list
index 6b4010a6..6b4010a6 100644
--- a/config/submodule/pico-sdk/module.list
+++ b/config/submodule/pico-sdk/default/module.list
diff --git a/config/submodule/pico-sdk/tinyusb/module.cfg b/config/submodule/pico-sdk/default/tinyusb/module.cfg
index 981e5305..981e5305 100644
--- a/config/submodule/pico-sdk/tinyusb/module.cfg
+++ b/config/submodule/pico-sdk/default/tinyusb/module.cfg
diff --git a/config/submodule/stm32-vserprog/libopencm3/module.cfg b/config/submodule/stm32-vserprog/default/libopencm3/module.cfg
index 3ac90162..3ac90162 100644
--- a/config/submodule/stm32-vserprog/libopencm3/module.cfg
+++ b/config/submodule/stm32-vserprog/default/libopencm3/module.cfg
diff --git a/config/submodule/stm32-vserprog/module.list b/config/submodule/stm32-vserprog/default/module.list
index f14cc1fa..f14cc1fa 100644
--- a/config/submodule/stm32-vserprog/module.list
+++ b/config/submodule/stm32-vserprog/default/module.list
diff --git a/config/u-boot/amd64coreboot/target.cfg b/config/u-boot/amd64coreboot/target.cfg
deleted file mode 100644
index d3415dc6..00000000
--- a/config/u-boot/amd64coreboot/target.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-tree="x86_64"
-# test building with x86_64 hostcc by commenting these:
-# xgcctree="default" # coreboot tree containing crossgcc
-# xarch="x86_64-elf"
-# or uncomment them to use crossgcc(buggy)
diff --git a/config/u-boot/i386coreboot/target.cfg b/config/u-boot/i386coreboot/target.cfg
deleted file mode 100644
index 213049fe..00000000
--- a/config/u-boot/i386coreboot/target.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-tree="x86"
-# test building with x86_64 hostcc by commenting these:
-# xgcctree="default" # coreboot tree containing crossgcc
-# xarch="i386-elf"
-# or uncomment them to use crossgcc(buggy)
diff --git a/include/env/get.sh b/include/env/get.sh
index 09126297..0ed9d6cc 100644
--- a/include/env/get.sh
+++ b/include/env/get.sh
@@ -3,52 +3,83 @@
 # Copyright (c) 2020-2021,2023-2026 Leah Rowe <leah@libreboot.org>
 # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 
-eval "`newvar url bkup_url depend loc subcurl subcurl_bkup subgit subgit_bkup \
-    subhash`"
+eval "`newvar url bkup_url fetch_depend loc subcurl subcurl_bkup subgit \
+    subgit_bkup subhash badhash badtghash`"
 
 tmpgit="$xbtmp/gitclone"
 tmpgitcache="$xbtmp/tmpgit"
 
-multi_tree_fetch()
+# delete a source tree and corresponding builds if metadata changed
+# inside config/ - this is done by hashing a concatenation of hashes
+# from all metadata, checked against a previously calculated hash
+
+delete_old_project_files()
 {
-	[ -d "src/$project/$tree" ] && return 0
+	# delete an entire source tree along with its builds:
+	same_pjhash mhash "$tree" badhash "$datadir" \
+	    "$configdir/$tree" "$mdir" || \
+		x_ rm -Rf "src/$project/$tree" "elf/$project/$tree"
 
-	git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \
-	    "src/$project/$tree" "submod"
+	x_ cp "$xbtmp/new.hash" "$XBMK_CACHE/mhash/$project$tree"
+
+	if [ -n "$target" ] && [ "$target" != "$tree" ]; then
+		# delete only target builds, if only the target changed
+		same_pjhash mtghash "$target" badtghash "$configdir/$target" \
+		    || x_ rm -Rf "elf/$project/$tree/$target"
+
+		x_ cp "$xbtmp/new.hash" "$XBMK_CACHE/mtghash/$project$target"
+	fi
 }
 
-single_tree_fetch()
+same_pjhash()
 {
-	xgcctree=""
+	eval "`newvar hash old_hash`"
+
+	hashdir="$1"
+	hashname="$2"
+	badhashvar="$3"
 
-	. "config/git/$project/pkg.cfg" || \
-	    err "Can't read config 'config/git/$project/pkg.cfg'" \
-	    "single_tree_fetch" "@"
+	shift 3
 
-	if [ -z "$url" ] || [ -z "$bkup_url" ]; then
-		err "url/bkup_url not both set 'config/git/$project/pkg.cfg'" \
-		    "single_tree_fetch" "$@"
+	x_ mkdir -p "$XBMK_CACHE/$hashdir"
+
+	if [ -f "$XBMK_CACHE/$hashdir/$project$hashname" ]; then
+		read -r old_hash < "$XBMK_CACHE/$hashdir/$project$hashname" \
+		    || err \
+		    "$hashdir: err '$XBMK_CACHE/$hashdir/$project$hashname'" \
+		    same_pjhash "$hashdir" "$hashname" "$badhashvar" "$@"
 	fi
 
-	[ -n "$xgcctree" ] && \
-		x_ "$mk" -f coreboot "$xgcctree"
+	eval "$build_sbase"
+	fx_ "x_ util/sbase/sha512sum" find "$@" -type f -not -path \
+	    "*/.git*/*" | awk '{print $1}' > "$xbtmp/tmp.hash" || \
+	    err "!h $project $hashdir" \
+	    "same_pjhash" "$hashdir" "$hashname" "$badhashvar" "$@"
+
+	hash="$(x_ "$sha512sum" "$xbtmp/tmp.hash" | awk '{print $1}' || \
+	    err)" || err "$hashname: Can't read sha512 of '$xbtmp/tmp.hash'" \
+	    "same_pjhash" "$hashdir" "$hashname" "$badhashvar" "$@"
+
+	if [ "$hash" != "$old_hash" ] || \
+	    [ ! -f "$XBMK_CACHE/$hashdir/$project$hashname" ]; then
+		eval "$badhashvar=\"y\""
+	fi
 
-	[ -n "$depend" ] && \
-		for d in $depend ; do
-			x_ "$mk" -f $d
-		done
+	printf "%s\n" "$hash" > "$xbtmp/new.hash" || \
+	    err "!mkhash $xbtmp/new.hash ($hashdir $hashname $badhashvar)" \
+	    "same_pjhash" "$hashdir" "$hashname" "$badhashvar" "$@"
 
-	$if_single_tree \
-		clone_project; :
+	eval "[ \"\$$badhashvar\" = \"y\" ] && return 1"; :
 }
 
-clone_project()
+fetch_trees()
 {
-	loc="src/$project"
-	[ -d "$loc" ] && return 0
+	[ -d "src/$project/$tree" ] && return 0
 
-	remkdir "${tmpgit%/*}"
-	git_prep "$url" "$bkup_url" "$xbmkpwd/config/$project/patches" "$loc"
+	mk_dependencies -f $fetch_depend
+
+	git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \
+	    "src/$project/$tree"
 }
 
 git_prep()
@@ -59,12 +90,10 @@ git_prep()
 	_loc="$4" # $1 and $2 are gitrepo and gitrepo_backup
 
 	[ -z "$rev" ] && \
-		err "$project/$tree: rev not set" "git_prep" "$@"
+		err "$project/$tree: rev unset" "git_prep" "$@"
 
 	xbget git "$1" "$2" "$tmpgit" "$rev" "$_patchdir"
-	if singletree "$project" || [ $# -gt 4 ]; then
-		dx_ fetch_submodule "$mdir/module.list"
-	fi
+	dx_ fetch_submodule "$mdir/module.list"
 
 	[ "$_loc" != "${_loc%/*}" ] && \
 		x_ mkdir -p "${_loc%/*}"
diff --git a/include/fw/inject.sh b/include/fw/inject.sh
index 98502d3c..2d4c99e6 100644
--- a/include/fw/inject.sh
+++ b/include/fw/inject.sh
@@ -4,7 +4,7 @@
 # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
 # Copyright (c) 2023-2026 Leah Rowe <leah@libreboot.org>
 
-cbcfgsdir="config/coreboot"
+cbcfgsdir="config/module/coreboot"
 tmpromdel="$XBMK_CACHE/DO_NOT_FLASH"
 nvmutil="util/nvmutil/nvmutil"
 ifdtool="elf/coreboot/default/ifdtool"
diff --git a/include/fw/mrc.sh b/include/fw/mrc.sh
index 10d7e437..19003af7 100644
--- a/include/fw/mrc.sh
+++ b/include/fw/mrc.sh
@@ -24,7 +24,7 @@ extract_refcode()
 
 	# enable the Intel GbE device, if told by offset MRC_refcode_gbe
 	[ -n "$MRC_refcode_gbe" ] && \
-		x_ dd if="config/ifd/hp820g2/1.bin" of="$appdir/ref" bs=1 \
+		x_ dd if="config/snippet/1" of="$appdir/ref" bs=1 \
 		    seek=$MRC_refcode_gbe count=1 conv=notrunc; :
 
 	x_ mv "$appdir/ref" "$_pre_dest"
diff --git a/include/fw/rom.sh b/include/fw/rom.sh
index 4189ac6b..20ac2604 100644
--- a/include/fw/rom.sh
+++ b/include/fw/rom.sh
@@ -26,7 +26,8 @@ buildser()
 copyps1bios()
 {
 	remkdir "bin/playstation"
-	x_ cp src/pcsx-redux/src/mips/openbios/openbios.bin bin/playstation
+	x_ cp src/pcsx-redux/default/src/mips/openbios/openbios.bin \
+	    bin/playstation
 
 	printf "MIT License\n\nCopyright (c) 2019-2025 PCSX-Redux authors\n\n" \
 	    > bin/playstation/COPYING.txt || \
@@ -59,7 +60,7 @@ corebootpremake()
 	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
 		return 0
 
-	fx_ check_coreboot_util printf "cbfstool\nifdtool\n"
+	forx 'check_coreboot_util %s' cbfstool ifdtool
 
 	printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \
 	    err "!mk $srcdir .coreboot-version" "corebootpremake" "$@"
@@ -70,8 +71,6 @@ corebootpremake()
 
 check_coreboot_util()
 {
-	[ "$badhash" = "y" ] && \
-		x_ rm -f "elf/coreboot/$tree/$1"
 	e "elf/coreboot/$tree/$1" f && \
 		return 0
 
@@ -111,10 +110,8 @@ mkcorebootbin()
 	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
 		return 0
 
-	forx 'check_coreboot_util %s' cbfstool ifdtool
-
-	for y in "$target_dir/config"/*; do
-		defconfig="$y"
+	for y in "$defscan"/*; do
+		buildcfg="$y"
 		mkcorebootbin_real
 	done
 
@@ -127,7 +124,7 @@ mkcorebootbin_real()
 
 	tmprom="$xbtmp/coreboot.rom"
 
-	initmode="${defconfig##*/}"
+	initmode="${buildcfg##*/}"
 	displaymode="${initmode##*_}"
 	if [ "$displaymode" = "$initmode" ]; then
 		# blank it for "normal" or "fspgop" configs:
@@ -138,7 +135,7 @@ mkcorebootbin_real()
 	cbfstool="elf/coreboot/$tree/cbfstool"
 
 	# cbfstool option backends, if they exist
-	cbfscfg="config/coreboot/$target/cbfs.cfg"
+	cbfscfg="config/module/coreboot/$target/cbfs.cfg"
 
 	elfrom="elf/coreboot/$tree/$target/$initmode"
 	[ -n "$displaymode" ] && \
@@ -183,7 +180,7 @@ mkcorebootbin_real()
 	[ -f "$cbfscfg" ] && \
 		dx_ add_cbfs_option "$cbfscfg"
 
-	if grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then
+	if grep "CONFIG_PAYLOAD_NONE=y" "$buildcfg"; then
 		if [ "$payload_seabios" = "y" ]; then
 			pname="seabios"
 			add_seabios
@@ -252,7 +249,9 @@ add_seabios()
 	fi
 
 	[ "$payload_memtest" = "y" ] && \
-		cbfs "$tmprom" "elf/memtest86plus/memtest.bin" img/memtest
+		cbfs "$tmprom" \
+		    "elf/memtest86plus/default/default/noconfig/memtest.bin" \
+		    img/memtest
 
 	[ "$payload_grub" = "y" ] && \
 		add_grub
@@ -377,6 +376,9 @@ cbfs()
 		lzma="-c lzma -l 0x1110000 -e 0x1110000"
 	fi
 
+	if [ $# -lt 2 ]; then
+		echo TEST
+	fi
 	x_ "$cbfstool" "$1" $ccmd -f "$2" -n "$3" $lzma
 }
 
diff --git a/include/fw/vendor.sh b/include/fw/vendor.sh
index 95cebb66..74946ac0 100644
--- a/include/fw/vendor.sh
+++ b/include/fw/vendor.sh
@@ -13,12 +13,12 @@
 # with inject.sh concatenated onto vendor.sh; they are inexorably intertwined.
 # The main "mk" script sources vendor.sh first, and then inject.sh, in lbmk.
 
-e6400_unpack="$xbmkpwd/src/bios_extract/dell_inspiron_1100_unpacker.py"
+e6400_unpack="$xbmkpwd/src/bios_extract/default/dell_inspiron_1100_unpacker.py"
 me7updateparser="$xbmkpwd/util/me7_update_parser/me7_update_parser.py"
-pfs_extract="$xbmkpwd/src/biosutilities/Dell_PFS_Extract.py"
-uefiextract="$xbmkpwd/elf/uefitool/uefiextract"
-bsdtar="$xbmkpwd/elf/libarchive/bsdtar"
-bsdunzip="$xbmkpwd/elf/libarchive/bsdunzip"
+pfs_extract="$xbmkpwd/src/biosutilities/default/Dell_PFS_Extract.py"
+uefiextract="$xbmkpwd/elf/uefitool/default/default/noconfig/uefiextract"
+bsdtar="$xbmkpwd/elf/libarchive/default/default/noconfig/bsdtar"
+bsdunzip="$xbmkpwd/elf/libarchive/default/default/noconfig/bsdunzip"
 vendir="vendorfiles"
 appdir="$vendir/app"
 vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
@@ -260,7 +260,7 @@ find_me()
 
 apply_deguard_hack()
 {
-	x_ cd src/deguard
+	x_ cd src/deguard/default
 
 	x_ ./finalimage.py --delta "data/delta/$ME11delta" \
 	     --version "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \
@@ -414,7 +414,7 @@ bootstrap()
 
 	mecleaner="$xbmkpwd/$cbdir/util/me_cleaner/me_cleaner.py"
 	[ "$XBMKmecleaner" = "y" ] && \
-		mecleaner="$xbmkpwd/src/me_cleaner/me_cleaner.py"
+		mecleaner="$xbmkpwd/src/me_cleaner/default/me_cleaner.py"
 
 	x_ "$mk" -f coreboot "${cbdir##*/}"
 	x_ "$mk" -f me_cleaner
diff --git a/include/lib.sh b/include/lib.sh
index b410a173..dde99065 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -82,18 +82,12 @@ e()
 	printf "%s %s\n" "$1" "$es2" 1>&2
 }
 
-singletree()
-{
-	( fx_ "eval exit 1 && err" find "config/$1/"*/ -type f \
-	    -name "target.cfg" ) || return 1; :
-}
-
 pad_one_byte()
 {
 	paddedfile="`mktemp || err "mktemp pad_one_byte"`" || \
 	    err "can't make tmp file" "pad_one_byte" "$@"
 
-	x_ cat "$1" config/data/coreboot/0 > "$paddedfile" || \
+	x_ cat "$1" "config/snippet/0" > "$paddedfile" || \
 	    err "could not pad file '$paddedfile'" "pad_one_byte" "$1"; :
 
 	x_ mv "$paddedfile" "$1"
diff --git a/include/mk/release.sh b/include/mk/release.sh
index 9063a4d4..f9f185c3 100644
--- a/include/mk/release.sh
+++ b/include/mk/release.sh
@@ -55,13 +55,13 @@ prep_release_src()
 
 	forx 'fx_ \"x_ rm -Rf\" x_ find . -name \".%s\"' git gitmodules
 
-	( fx_ nuke x_ find config -type f -name "nuke.list" ) || \
+	( fx_ nuke x_ find config/module -type f -name "nuke.list" ) || \
 	    err "can't prune project files" "prep_release_src" "$@"; :
 }
 
 nuke()
 {
-	r="$rsrc/src/${1#config/}"
+	r="$rsrc/src/${1#config/module/}"
 
 	if [ -d "${r%/*}" ]; then
 		x_ cd "${r%/*}"
diff --git a/mk b/mk
index e767d45f..981b18c9 100755
--- a/mk
+++ b/mk
@@ -80,18 +80,22 @@ eval "$(printf "version release download inject\n" | awk '{ for (i=1; i<=NF; \
     i++) $i = "[ \""$i"\" = \"$_f\" ] && x_ "$i" \"$@\" && exit 0;"; print }')"
 
 # macros, overridden depending on the flag
-if_not_do_make=":" # : means false
 if_make_config=":"
 if_build=":" # can be false even if make is true
 if_dry_build=":"
-if_single_tree=":"
-eval "`newvar if_do_make if_not_make_config if_not_build if_not_dry_build`"
+eval "`newvar if_not_make_config if_not_build if_not_dry_build`"
 
-eval "`newvar configureargs autogenargs badhash badtghash bootstrapargs \
-    build_depend buildtype cleanargs cmakedir cmd defconfig dest_dir elfdir \
-    flag forcepull listfile makeargs mdir mkhelper mkhelpercfg mode postmake \
-    premake project release rev srcdir target target_dir tree xarch xgcctree \
-    xlang`"
+# these variables will also be initialised in configure_target
+cfgvars="autogenargs cmakedir configureargs badhash badtghash bootstrapargs \
+    build_depend cleanargs fetch_depend makeargs mkhelper noconfig postmake \
+    premake release rev tree xarch xgcctree xlang cfgname defscan"
+
+eval "`newvar buildcfg dest_dir elfdir flag forcepull listfile mdir \
+    mkhelpercfg mode project srcdir target target_dir _tcfg \
+    $cfgvars`"
+
+# when saved to e.g. coreboot src. can be overridden by projects
+cfgname_default=".config" # e.g. src/coreboot/default/.config
 
 main()
 {
@@ -114,8 +118,7 @@ main()
 			if_not_dry_build=":"
 			;;
 		-f|-F) # download source code for a project
-			eval "`newvar if_not_do_make if_dry_build`"
-			if_do_make=":"
+			if_dry_build=""
 			if_not_dry_build=":"
 			[ "$flag" = "-F" ] && \
 				forcepull="y"; : # never skip git fetch/pull
@@ -142,287 +145,174 @@ main()
 			break
 		fi
 
+		# user can type e.g. ./mk -f src/flashprog
 		project="${OPTARG#src/}"
-		project="${project#config/git/}"
+		project="${project#config/module/}"
 
 		shift 2
 	done
 
-	if [ -z "$flag" ]; then
-		err "missing flag ($flags)" "trees" "$@"
-	elif [ -z "$project" ]; then
-		fx_ "x_ "$mk" $flag" x_ ls -1 config/git
-		return 0
-	elif [ ! -f "config/git/$project/pkg.cfg" ]; then
-		err "config/git/$project/pkg.cfg missing" "trees" "$@"
-	fi
+	[ -z "$flag" ] && err "missing flag ($flags)" "trees" "$@"
+	[ -z "$project" ] && \
+		x_ fx_ "x_ "$mk" $flag" x_ find "config/module" \
+		    -mindepth 1 -maxdepth 1 -type d && return 0
+	[ ! -d "config/module/$project" ] && \
+		err "module '$project' not found" main "$flag" "" "$@"
 
-	elfdir="elf/$project"
 	datadir="config/data/$project"
-	configdir="config/$project"
-	srcdir="src/$project"
-	dest_dir="$elfdir"
+	configdir="config/module/$project"
+	[ "${1-}" = "list" ] && \
+		x_ ls -1 "$configdir" && \
+		return 0
 
 	listfile="$datadir/build.list"
 	[ ! -f "$listfile" ] && \
-		listfile="" # build.list is optional on all projects
+		listfile="" # TODO: override listfile per-tree
 
 	mkhelpercfg="$datadir/mkhelper.cfg"
-	if e "$mkhelpercfg" f missing; then
+	e "$mkhelpercfg" f missing && \
 		mkhelpercfg="$xbtmp/mkhelper.cfg"
-		x_ touch "$mkhelpercfg"
-	fi
-
-	if singletree "$project"; then
-		cmd="mk_single_tree"
-		if_single_tree=""
-	else
-		cmd="mk_multi_tree"
-	fi
+	x_ touch "$mkhelpercfg"
 
 	remkdir "${tmpgit%/*}"
 	x_ touch "$mkhelpercfg"
 
-	. "$mkhelpercfg"
-	$cmd "$@"
-}
-
-mk_single_tree()
-{
-	configure_project "$configdir" || \
-		return 0
-
-	[ ! -f "$listfile" ] || $if_not_dry_build \
-		elfcheck || return 0
-
-	run_make_command && $if_build $if_not_dry_build \
-		copy_elf; :
-}
-
-mk_multi_tree()
-{
-	[ ! -d "$configdir" ] && err "missing '$configdir'" mk_multi_tree "$@"
-	[ $# -lt 1 ] && fx_ mk_multi_tree find "$configdir" \
+	[ ! -d "$configdir" ] && err "missing '$configdir'" handle_target "$@"
+	[ $# -lt 1 ] && fx_ handle_target find "$configdir" \
 		    -mindepth 1 -maxdepth 1 -type d
 
-	[ $# -gt 0 ] && for x in "$@"
-	do
-		unset CROSS_COMPILE
-		export PATH="$xbmkpath"
-
-		if [ "$x" = "list" ]; then
-			x_ ls -1 "config/$project"
-			listfile=""
-			break
-		fi
-
-		printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$x"
-
-		target="${x##*/}"
-
-		x_ handle_defconfig
-		$if_build \
-			x_ $postmake; :
-	done; :
+	while [ $# -gt 0 ]; do
+		handle_target "$1"
+		shift 1
+	done
 }
 
-handle_defconfig()
+handle_target()
 {
-	target_dir="$configdir/$target"
-
-	[ ! -f "CHANGELOG" ] && \
-		single_tree_fetch "$project"
-
-	configure_project "$target_dir" || \
-		return 0
+	unset CROSS_COMPILE
+	export PATH="$xbmkpath"
 
-	[ -z "$tree" ] && err "$configdir: 'tree' unset" handle_defconfig "$@"
+	printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$1"
 
-	srcdir="src/$project/$tree"
-
-	[ -d "$srcdir" ] && for y in "$target_dir/config"/*
-	do
-		[ ! -f "$y" ] && \
-			$if_not_dry_build \
-				continue
-
-		$if_not_dry_build eval \
-			defconfig="$y"
-
-		$if_build \
-			prep_mk_multi_tree || continue
+	target="${1##*/}"
+	target_dir="$configdir/$target"
 
-		handle_makefile
+	configure_target "$target_dir" && \
+		x_ handle_buildcfg
 
-		$if_build $if_not_dry_build \
-			copy_elf; :
-	done; :
+	$if_build \
+		x_ $postmake; :
 }
 
-configure_project()
+configure_target()
 {
 	_tcfg="$1/target.cfg"
 
-	eval "`newvar configureargs badhash badtghash bootstrapargs \
-	    build_depend buildtype cleanargs makeargs mkhelper postmake \
-	    premake release xarch xgcctree xlang`"
+	eval "`newvar $cfgvars`"
 
-	[ ! -f "$_tcfg" ] && buildtype="auto"
-
-	# globally initialise all variables for a source tree / target:
-	if e "$datadir/mkhelper.cfg" f; then
-		. "$datadir/mkhelper.cfg" || \
-		    err "Can't read '$datadir/mkhelper.cfg'" \
-		    "configure_project" "$@"
-	fi
+	. "$mkhelpercfg" # mkhelper reinitialisation
 
 	# override target/tree specific variables from per-target config:
-	while e "$_tcfg" f || [ "$cmd" != "mk_single_tree" ]
-	do
-		printf "Loading %s config: %s\n" "$project" "$_tcfg"
-		eval "`newvar rev tree`"
+	while [ -z "$rev" ] && try_target_config; do :; done
+	[ -z "$tree" ] && \
+		err "$project/$target: tree unset" configure_target "$@"
 
-		. "$_tcfg" || err "Can't read '$_tcfg'" configure_project "$@"
+	$if_build $if_not_dry_build \
+		mk_dependencies -b $build_depend
 
-		$if_dry_build eval \
-			build_depend=""
+	srcdir="src/$project/$tree"
 
-		$if_single_tree \
-			break
-		$if_do_make \
-			break
-		[ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] \
-			&& break # target and tree matching was successful
+	# specify directory containing e.g. coreboot defconfigs
+	x_ mkdir -p "$xbtmp/noconfig/config"
+	x_ touch "$xbtmp/noconfig/config/noconfig"
+	[ "$noconfig" = "y" ] && \
+		defscan="$xbtmp/noconfig/config" # no configs on this project
+	( fx_ "eval exit 1 && err" find "$target_dir/config" -type f ) || \
+		[ -n "$defscan" ] || defscan="$target_dir/config"
 
-		_tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg" # try next
-	done
+	# filename in srcdir when copying e.g. coreboot defconfig -> .config
+	[ -z "$cfgname" ] && cfgname="$cfgname_default" # e.g. $srcdir/.config
 
 	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
 		return 1
-	[ -n "$buildtype" ] && $if_make_config \
+	[ "$noconfig" = "y" ] && $if_make_config \
 		return 1
 
-	$if_build $if_not_dry_build \
-		build_dependencies
-
-	mdir="$xbmkpwd/config/submodule/$project"
-	[ -n "$tree" ] && mdir="$mdir/$tree"
+	mdir="$xbmkpwd/config/submodule/$project/$tree"
 
-	if [ ! -f "CHANGELOG" ]; then
-		delete_old_project_files
-		$if_not_do_make \
-			${cmd#mk_}_fetch
-	fi
-	$if_not_do_make \
-		return 1
+	[ -f "CHANGELOG" ] && return 0 # disable fetching on release archives
 
-	x_ "$mk" -f "$project" "$target"
+	delete_old_project_files
+	[ ! -f "CHANGELOG" ] && x_ fetch_trees; :
 }
 
-# projects can specify which other projects
-# to build first, as declared dependencies:
-
-build_dependencies()
+try_target_config()
 {
-	for bd in $build_depend
-	do
-		bd_project="${bd%%/*}"
-		bd_tree="${bd##*/}"
+	printf "Try %s/%s config: %s\n" "$project" "$_tcfg" "$target"
+	eval "`newvar rev tree`"
+
+	. "$_tcfg" || err "Can't read '$_tcfg'" configure_target "$@"
+	if [ -n "$rev" ] && [ -z "$tree" ]; then
+		# this makes setting tree= optional on configless projects
+		tree="${_tcfg%/target.cfg}"
+		tree="${tree##*/}"
+	elif [ -z "$tree" ]; then
+		err "$project/$target: tree unset" try_target_config "$@"
+	fi
 
-		[ -z "$bd_project" ] && \
-			$if_not_dry_build \
-				err "$project/$tree: !bd '$bd'" \
-				    "build_dependencies" "$@"
+	[ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] && \
+		return 1 # target and tree matching was successful
 
-		[ "${bd##*/}" = "$bd" ] && \
-			bd_tree=""
+	_ncfg="${_tcfg%/*/target.cfg}/$tree/target.cfg"
+	[ "$_ncfg" = "$_tcfg" ] && \
+		err "$project/$target: can't determine tree" "$@" # no change
 
-		[ -n "$bd_project" ] && \
-			$if_not_dry_build \
-				x_ "$mk" -b $bd_project $bd_tree; :
-	done; :
+	_tcfg="$_ncfg" # try next
 }
 
-# delete_old_project_files along with project_up_to_date,
-# concatenates the sha512sum hashes of all files related to
-# a project, tree or target, then gets the sha512sum of that
-# concatenation. this is checked against any existing
-# calculation previously cached; if the result differs, or
-# nothing was previously stored, we know to delete resources
-# such as builds, project sources and so on, for auto-rebuild:
-
-delete_old_project_files()
+# projects can specify which other projects
+# to build first, as declared dependencies:
+# TODO: detect infinite loops
+mk_dependencies()
 {
-	# delete an entire source tree along with its builds:
-	project_up_to_date hash "$tree" badhash "$datadir" \
-	    "$configdir/$tree" "$mdir" || \
-		x_ rm -Rf "src/$project/$tree" "elf/$project/$tree"
-
-	x_ cp "$xbtmp/new.hash" "$XBMK_CACHE/hash/$project$tree"
-
-	if singletree "$project" || [ -z "$target" ] || [ "$target" = "$tree" ]
-	then
-		return 0
-	fi
-
-	# delete only the builds of a given target, but not src.
-	# this is useful when only the target config changes, for
-	# example x200_8mb coreboot configs change, but not coreboot:
+	bdf="${1-}"
+	shift 1 2>/dev/null || :
+	while [ $# -gt 0 ]; do
+		bd_tree="${1##*/}"
+		[ "${1%%/*}" = "$1" ] && bd_tree="" # build all trees
 
-	project_up_to_date tghash "$target" badtghash "$configdir/$target" || \
-		x_ rm -Rf "elf/$project/$tree/$target"
+		[ -z "${1%%/*}" ] && \
+			err "$project/$tree: !bd '$1'" mk_dependencies "$@"
 
-	x_ cp "$xbtmp/new.hash" "$XBMK_CACHE/tghash/$project$target"
+		x_ "$mk" $bdf ${1%%/*} $bd_tree; :
+		shift 1
+	done; :
 }
 
-project_up_to_date()
+handle_buildcfg()
 {
-	eval "`newvar hash old_hash`"
-
-	hashdir="$1"
-	hashname="$2"
-	badhashvar="$3"
-
-	shift 3
-
-	x_ mkdir -p "$XBMK_CACHE/$hashdir"
-
-	if [ -f "$XBMK_CACHE/$hashdir/$project$hashname" ]; then
-		read -r old_hash < "$XBMK_CACHE/$hashdir/$project$hashname" \
-		    || err \
-		    "$hashdir: err '$XBMK_CACHE/$hashdir/$project$hashname'" \
-		    "project_up_to_date" "$hashdir" "$hashname" "$badhashvar" \
-		    "$@"
-	fi
-
-	eval "$build_sbase"
-	fx_ "x_ util/sbase/sha512sum" find "$@" -type f -not -path \
-	    "*/.git*/*" | awk '{print $1}' > "$xbtmp/tmp.hash" || \
-	    err "!h $project $hashdir" \
-	    "project_up_to_date" "$hashdir" "$hashname" "$badhashvar" "$@"
-
-	hash="$(x_ "$sha512sum" "$xbtmp/tmp.hash" | awk '{print $1}' || \
-	    err)" || err "$hashname: Can't read sha512 of '$xbtmp/tmp.hash'" \
-	    "project_up_to_date" "$hashdir" "$hashname" "$badhashvar" "$@"
+	[ ! -d "$srcdir" ] || for y in "$defscan"/*
+	do
+		buildcfg="$y"
+		dest_dir="elf/$project/$tree/$target/${y##*/}"
 
-	if [ "$hash" != "$old_hash" ] || \
-	    [ ! -f "$XBMK_CACHE/$hashdir/$project$hashname" ]; then
-		eval "$badhashvar=\"y\""
-	fi
+		$if_build $if_not_dry_build \
+			check_build_environment "$y" || continue
 
-	printf "%s\n" "$hash" > "$xbtmp/new.hash" || \
-	    err "!mkhash $xbtmp/new.hash ($hashdir $hashname $badhashvar)" \
-	    "project_up_to_date" "$hashdir" "$hashname" "$badhashvar" "$@"
+		handle_makefile # also supports non-build operations
 
-	eval "[ \"\$$badhashvar\" = \"y\" ] && return 1"; :
+		$if_build $if_not_dry_build \
+			copy_elf; :
+	done; :
 }
 
-prep_mk_multi_tree()
+check_build_environment()
 {
-	dest_dir="$elfdir/$tree/$target/${defconfig#"$target_dir/config/"}"
+	[ ! -f "$1" ] && return 1
 
-	$if_not_dry_build elfcheck || return 1 # skip if a build exists
-	$if_not_dry_build eval "$(printf '%s\n' "$xarch" | awk \
+	( fx_ "eval exit 1 && err" find "$dest_dir" -type f ) || return 1
+
+	eval "$(printf '%s\n' "$xarch" | awk \
 	    '{ for (i=1; i<=NF; i++) $i = "check_xgcc \""$i"\";"; print }')"
 }
 
@@ -461,49 +351,38 @@ check_xgcc()
 	x_ touch "$xgccfile" # prevent unnecessary re-build operations
 }
 
-elfcheck()
-{
-	# TODO: *STILL* very hacky check. do it properly (based on build.list)
-	( fx_ "eval exit 1 && err" find "$dest_dir" -type f ) || return 1; :
-}
-
 handle_makefile()
 {
 	check_makefile "$srcdir" && $if_not_dry_build \
 		x_ make -C "$srcdir" clean $cleanargs
 
-	[ -f "$defconfig" ] && \
-		x_ cp "$defconfig" "$srcdir/.config"
+	[ -f "$buildcfg" ] && \
+		x_ cp "$buildcfg" "$srcdir/$cfgname"
 
-	run_make_command || err "no makefile!" "handle_makefile" "$@"
+	$if_build \
+		x_ $premake
+	$if_not_dry_build \
+		run_make_command
+	$if_build \
+		x_ $mkhelper; :
 
-	_copy=".config"
+	_copy="$cfgname"
 	[ "$mode" = "savedefconfig" ] && \
 		_copy="defconfig"
 
 	$if_make_config \
-		x_ cp "$srcdir/$_copy" "$defconfig"; :
+		x_ cp "$srcdir/$_copy" "$buildcfg"; :
 }
 
 run_make_command()
 {
-	$if_build \
-		x_ $premake
-	$if_not_dry_build \
-		run_make_command_real || return 1
-	$if_build \
-		x_ $mkhelper; :
-}
-
-run_make_command_real()
-{
 	[ -z "$cmakedir" ] || \
 		x_ cmake -B "$srcdir" "$srcdir/$cmakedir"
 	$if_build \
 		check_autoconf "$srcdir"
 
-	check_makefile "$srcdir" || return 1
-	x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
+	check_makefile "$srcdir" && \
+	    x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
 }
 
 check_autoconf()
@@ -541,6 +420,7 @@ copy_elf()
 		    "cannot read '$listfile'" "copy_elf" "$@"; :
 	fi
 
+	check_makefile "$srcdir" || return 1
 	( x_ make -C "$srcdir" clean $cleanargs ) || \
 	    err "can't make-clean '$srcdir'" "copy_elf" "$@"; :
 }