diff --git a/config/coreboot/dell780mt_8mb/target.cfg b/config/coreboot/dell780mt_8mb/target.cfg
index eca44aa..50ea82b 100644
--- a/config/coreboot/dell780mt_8mb/target.cfg
+++ b/config/coreboot/dell780mt_8mb/target.cfg
@@ -5,4 +5,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/dell780mt_truncate_8mb/target.cfg b/config/coreboot/dell780mt_truncate_8mb/target.cfg
index eca44aa..50ea82b 100644
--- a/config/coreboot/dell780mt_truncate_8mb/target.cfg
+++ b/config/coreboot/dell780mt_truncate_8mb/target.cfg
@@ -5,4 +5,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/dell780usff_8mb/target.cfg b/config/coreboot/dell780usff_8mb/target.cfg
index eca44aa..50ea82b 100644
--- a/config/coreboot/dell780usff_8mb/target.cfg
+++ b/config/coreboot/dell780usff_8mb/target.cfg
@@ -5,4 +5,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/dell780usff_truncate_8mb/target.cfg b/config/coreboot/dell780usff_truncate_8mb/target.cfg
index eca44aa..50ea82b 100644
--- a/config/coreboot/dell780usff_truncate_8mb/target.cfg
+++ b/config/coreboot/dell780usff_truncate_8mb/target.cfg
@@ -5,4 +5,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/e4300_4mb/target.cfg b/config/coreboot/e4300_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/e4300_4mb/target.cfg
+++ b/config/coreboot/e4300_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg
index 98eb8d3..a0b322d 100644
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/coreboot/e6400_4mb/target.cfg
@@ -5,3 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="e6400"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/g43t_am3/target.cfg b/config/coreboot/g43t_am3/target.cfg
index 7f3d788..7bc2778 100644
--- a/config/coreboot/g43t_am3/target.cfg
+++ b/config/coreboot/g43t_am3/target.cfg
@@ -3,4 +3,5 @@ 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 u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/g43t_am3_16mb/target.cfg b/config/coreboot/g43t_am3_16mb/target.cfg
index 594b661..bef863e 100644
--- a/config/coreboot/g43t_am3_16mb/target.cfg
+++ b/config/coreboot/g43t_am3_16mb/target.cfg
@@ -4,4 +4,5 @@ payload_seabios="y"
 payload_memtest="y"
 release="n"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/kcma_d8_16mb/target.cfg b/config/coreboot/kcma_d8_16mb/target.cfg
index 5f705f4..b0ab3d0 100644
--- a/config/coreboot/kcma_d8_16mb/target.cfg
+++ b/config/coreboot/kcma_d8_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/kcma_d8_2mb/target.cfg b/config/coreboot/kcma_d8_2mb/target.cfg
index 5f705f4..b0ab3d0 100644
--- a/config/coreboot/kcma_d8_2mb/target.cfg
+++ b/config/coreboot/kcma_d8_2mb/target.cfg
@@ -6,4 +6,5 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/kfsn4_dre_1mb/target.cfg b/config/coreboot/kfsn4_dre_1mb/target.cfg
index 57e6458..c5759ac 100644
--- a/config/coreboot/kfsn4_dre_1mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_1mb/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 xlang="c"
-build_depend="seabios/default memtest86plus"
+build_depend="seabios/default memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/kfsn4_dre_2mb/target.cfg b/config/coreboot/kfsn4_dre_2mb/target.cfg
index 606962a..9460110 100644
--- a/config/coreboot/kfsn4_dre_2mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_2mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 xlang="c"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/kgpe_d16_16mb/target.cfg b/config/coreboot/kgpe_d16_16mb/target.cfg
index 5f705f4..b0ab3d0 100644
--- a/config/coreboot/kgpe_d16_16mb/target.cfg
+++ b/config/coreboot/kgpe_d16_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/kgpe_d16_2mb/target.cfg b/config/coreboot/kgpe_d16_2mb/target.cfg
index 5f705f4..b0ab3d0 100644
--- a/config/coreboot/kgpe_d16_2mb/target.cfg
+++ b/config/coreboot/kgpe_d16_2mb/target.cfg
@@ -6,4 +6,5 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"
+build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg
index 9ceb99e..2661c6b 100644
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/coreboot/macbook11/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"
+build_depend="seabios/default grub/default u-boot/i386coreboot"
+payload_uboot_i386="y"
diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg
index a53a166..e37b630 100644
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/coreboot/macbook11_16mb/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 scan_scan_disk="ahci"
-build_depend="seabios/default grub/default"
+build_depend="seabios/default grub/default u-boot/i386coreboot"
+payload_uboot_i386="y"
diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/coreboot/macbook21/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/coreboot/macbook21_16mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/qemu_x86_64_12mb/target.cfg b/config/coreboot/qemu_x86_64_12mb/target.cfg
index 3db013b..5c1a733 100644
--- a/config/coreboot/qemu_x86_64_12mb/target.cfg
+++ b/config/coreboot/qemu_x86_64_12mb/target.cfg
@@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_grub="y"
 payload_seabios="y"
 payload_memtest="y"
-build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
 payload_uboot_amd64="y"
diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/coreboot/r400_16mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/coreboot/r400_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg
index f596cc0..ba49083 100644
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/coreboot/r400_8mb/target.cfg
@@ -3,3 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/coreboot/r500_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/coreboot/t400_16mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/coreboot/t400_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/coreboot/t400_8mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/coreboot/t500_16mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/coreboot/t500_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/coreboot/t500_8mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg
index 9ceb99e..2661c6b 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"
+build_depend="seabios/default grub/default u-boot/i386coreboot"
+payload_uboot_i386="y"
diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg
index 9ceb99e..2661c6b 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"
+build_depend="seabios/default grub/default u-boot/i386coreboot"
+payload_uboot_i386="y"
diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/coreboot/w500_16mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/coreboot/w500_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/coreboot/w500_8mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/coreboot/x200_16mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/coreboot/x200_4mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg
index 4a9af47..0b81f02 100644
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/coreboot/x200_8mb/target.cfg
@@ -4,3 +4,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg
index 16ffc81..a364653 100644
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/coreboot/x301_16mb/target.cfg
@@ -5,3 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg
index 16ffc81..a364653 100644
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/coreboot/x301_4mb/target.cfg
@@ -5,3 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg
index 16ffc81..a364653 100644
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/coreboot/x301_8mb/target.cfg
@@ -5,3 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
+payload_uboot_amd64="y"
\ No newline at end of file
diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg
index 9ceb99e..2661c6b 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"
+build_depend="seabios/default grub/default u-boot/i386coreboot"
+payload_uboot_i386="y"
diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg
index 9ceb99e..2661c6b 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@@ -3,4 +3,5 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"
+build_depend="seabios/default grub/default u-boot/i386coreboot"
+payload_uboot_i386="y"
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index a912400..a218e0e 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -1,7 +1,7 @@
 . "include/rom.sh"
 
 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"