12 files changed, 49 insertions, 2 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
deleted file mode 100644
index f6535149..00000000
--- a/config/data/coreboot/build.list
+++ /dev/null
@@ -1 +0,0 @@
-build/coreboot.rom
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
new file mode 100644
index 00000000..da9015f1
--- /dev/null
+++ b/config/data/coreboot/mkhelper.cfg
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
+build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
+
+seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
+
+pv="payload_seabios payload_memtest payload_grub payload_grubsea"
+v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname"
+v="$v displaymode tmprom newrom payload_uboot"
+eval `setvars "n" $pv`
+eval `setvars "" $v`
+
+premake="corebootpremake"
+mkhelper="mkcorebootbin"
+postmake="mkcoreboottar"
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
new file mode 100644
index 00000000..8c250f6b
--- /dev/null
+++ b/config/data/grub/mkhelper.cfg
@@ -0,0 +1,7 @@
+# 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"
+mkhelper="mkpayload_grub"
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 3555ad11..1ee5327f 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 \
diff --git a/config/data/grub/module/nvme b/config/data/grub/module/nvme
index 503c61c8..a3a2847c 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 \
diff --git a/config/data/grub/module/xhci b/config/data/grub/module/xhci
index 8bf80bfe..ee4d10f7 100755
--- a/config/data/grub/module/xhci
+++ b/config/data/grub/module/xhci
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # Install modules (installed, but not automatically loaded)
 grub_install_modules=" \
 hexdump \
@@ -8,6 +10,7 @@ usbserial_ftdi \
 usbserial_pl2303 \
 usbserial_usbdebug \
 video_colors \
+xhci \
 "
 # Modules (and always loaded)
 grub_modules=" \
@@ -35,7 +38,6 @@ crypto \
 cryptodisk \
 diskfilter \
 echo \
-xhci \
 ehci \
 eval \
 exfat \
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
new file mode 100644
index 00000000..982c365b
--- /dev/null
+++ b/config/data/pico-serprog/mkhelper.cfg
@@ -0,0 +1,7 @@
+# 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="$dry 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
new file mode 100644
index 00000000..bb2189a6
--- /dev/null
+++ b/config/data/stm32-vserprog/mkhelper.cfg
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+sersrc="src/stm32-vserprog"
+serx="$sersrc/stm32-vserprog.hex"
+serdir="$sersrc/boards"
+mkhelper="$dry 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