4 files changed, 23 insertions, 21 deletions
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