6 files changed, 5 insertions, 9 deletions
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index c993fbd4..da9015f1 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -5,13 +5,12 @@ build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
 
 seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
 
-pv="payload_uboot payload_seabios payload_memtest payload_grub"
-pv="$pv payload_uboot_i386 payload_uboot_amd64 payload_grubsea"
+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"
+v="$v displaymode tmprom newrom payload_uboot"
 eval `setvars "n" $pv`
 eval `setvars "" $v`
 
-premake="mkvendorfiles"
+premake="corebootpremake"
 mkhelper="mkcorebootbin"
 postmake="mkcoreboottar"
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 1ee5327f..faa2473e 100755
--- a/config/data/grub/module/default
+++ b/config/data/grub/module/default
@@ -69,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 a3a2847c..5ff32329 100755
--- a/config/data/grub/module/nvme
+++ b/config/data/grub/module/nvme
@@ -69,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
index ee4d10f7..05bd82aa 100755
--- a/config/data/grub/module/xhci
+++ b/config/data/grub/module/xhci
@@ -70,7 +70,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg
index 8e902bda..982c365b 100644
--- a/config/data/pico-serprog/mkhelper.cfg
+++ b/config/data/pico-serprog/mkhelper.cfg
@@ -4,4 +4,4 @@ sersrc="src/pico-serprog"
 serx="$sersrc/build/pico_serprog.uf2"
 picosdk="src/pico-sdk"
 serdir="$picosdk/src/boards/include/boards"
-premake="mkserprog pico"
+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
index 907e890f..bb2189a6 100644
--- a/config/data/stm32-vserprog/mkhelper.cfg
+++ b/config/data/stm32-vserprog/mkhelper.cfg
@@ -3,4 +3,4 @@
 sersrc="src/stm32-vserprog"
 serx="$sersrc/stm32-vserprog.hex"
 serdir="$sersrc/boards"
-mkhelper="mkserprog stm32"
+mkhelper="$dry eval fx_ \"buildser stm32\" x_ basename -as .h \"\$serdir/\"*.h"