15 files changed, 48 insertions, 20 deletions
diff --git a/config/data/coreboot/0 b/config/data/coreboot/0
new file mode 100644
index 00000000..f76dd238
--- /dev/null
+++ b/config/data/coreboot/0
diff --git a/config/data/coreboot/build.list b/config/data/coreboot/build.list
new file mode 100644
index 00000000..f6535149
--- /dev/null
+++ b/config/data/coreboot/build.list
@@ -0,0 +1 @@
+build/coreboot.rom
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 73cc957d..8414ab53 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -1,16 +1,28 @@
-. "include/rom.sh"
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-build_depend="seabios/default grub/default memtest86plus"
+build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
 
-seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
+seavgabiosrom="elf/seabios/default/default/libgfxinit/vgabios.bin"
 
-pv="payload_uboot payload_seabios payload_memtest payload_grub"
-v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname"
-v="$v displaymode tmprom newrom"
-eval `setvars "n" $pv`
-eval `setvars "" $v`
+payload_seabios="n"
+payload_memtest="n"
+payload_grub="n"
+payload_grubsea="n"
 
-premake="mkvendorfiles"
-mkhelper="mkcorebootbin"
-postmake="mkcoreboottar"
+initmode=""
+ubootelf=""
+grub_scan_disk=""
+uboot_config=""
+grubtree=""
+grubelf=""
+pname=""
+displaymode=""
+tmprom=""
+newrom=""
+payload_uboot=""
+cbfscfg=""
+
+premake="corebootpremake"
+mkhelper="coreboot_pad_one_byte"
+postmake="mkcorebootbin"
diff --git a/config/data/grub/bootorder_uboot b/config/data/grub/bootorder_uboot
new file mode 100644
index 00000000..80641a36
--- /dev/null
+++ b/config/data/grub/bootorder_uboot
@@ -0,0 +1 @@
+/rom@img/u-boot
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
index b75cf9d7..e445900d 100644
--- a/config/data/grub/mkhelper.cfg
+++ b/config/data/grub/mkhelper.cfg
@@ -1,7 +1,7 @@
-. "include/rom.sh"
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
 autoconfargs="--with-platform=coreboot --disable-werror"
 makeargs="FS_PAYLOAD_MODULES=\"\""
-btype="autohell"
+buildtype="autohell"
 mkhelper="mkpayload_grub"
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 3555ad11..faa2473e 100755
--- a/config/data/grub/module/default
+++ b/config/data/grub/module/default
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # Install modules (installed, but not automatically loaded)
 grub_install_modules=" \
 hexdump \
@@ -67,7 +69,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
diff --git a/config/data/grub/module/nvme b/config/data/grub/module/nvme
index 503c61c8..5ff32329 100755
--- a/config/data/grub/module/nvme
+++ b/config/data/grub/module/nvme
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # Install modules (installed, but not automatically loaded)
 grub_install_modules=" \
 hexdump \
@@ -67,7 +69,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
diff --git a/config/data/grub/module/xhci b/config/data/grub/module/xhci_nvme
index 6235bbad..05bd82aa 100755
--- a/config/data/grub/module/xhci
+++ b/config/data/grub/module/xhci_nvme
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # Install modules (installed, but not automatically loaded)
 grub_install_modules=" \
 hexdump \
@@ -68,7 +70,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
diff --git a/config/data/libarchive/build.list b/config/data/libarchive/build.list
new file mode 100644
index 00000000..044f9db2
--- /dev/null
+++ b/config/data/libarchive/build.list
@@ -0,0 +1,3 @@
+bsdtar
+bsdunzip
+bsdcpio
diff --git a/config/data/libarchive/mkhelper.cfg b/config/data/libarchive/mkhelper.cfg
new file mode 100644
index 00000000..f1678f17
--- /dev/null
+++ b/config/data/libarchive/mkhelper.cfg
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+premake="autoreconf -fiv src/libarchive"
diff --git a/config/data/pcsx-redux/mkhelper.cfg b/config/data/pcsx-redux/mkhelper.cfg
new file mode 100644
index 00000000..6ad20de5
--- /dev/null
+++ b/config/data/pcsx-redux/mkhelper.cfg
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+postmake="copyps1bios"
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg
index e424e2f4..5a4546a6 100644
--- a/config/data/pico-serprog/mkhelper.cfg
+++ b/config/data/pico-serprog/mkhelper.cfg
@@ -1,7 +1,7 @@
-. "include/rom.sh"
+# 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="mkserprog rp2040"
+premake="$if_not_dry_build eval fx_ \"buildser pico\" x_ basename -as .h \"\$serdir/\"*.h"
diff --git a/config/data/seabios/mkhelper.cfg b/config/data/seabios/mkhelper.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/config/data/seabios/mkhelper.cfg
+++ /dev/null
diff --git a/config/data/stm32-vserprog/mkhelper.cfg b/config/data/stm32-vserprog/mkhelper.cfg
index 8f45d7fd..26ea5acd 100644
--- a/config/data/stm32-vserprog/mkhelper.cfg
+++ b/config/data/stm32-vserprog/mkhelper.cfg
@@ -1,6 +1,6 @@
-. "include/rom.sh"
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 sersrc="src/stm32-vserprog"
 serx="$sersrc/stm32-vserprog.hex"
 serdir="$sersrc/boards"
-mkhelper="mkserprog stm32"
+mkhelper="$if_not_dry_build eval fx_ \"buildser stm32\" x_ basename -as .h \"\$serdir/\"*.h"
diff --git a/config/data/u-boot/build.list b/config/data/u-boot/build.list
index 8d9a5cf0..5af3064a 100644
--- a/config/data/u-boot/build.list
+++ b/config/data/u-boot/build.list
@@ -4,3 +4,5 @@ u-boot.dtb
 u-boot.img
 u-boot.itb
 u-boot.elf
+u-boot-dtb.bin
+u-boot-x86-with-spl.bin