87 changed files with 30 additions and 345 deletions
--- a/config/coreboot/dell3050micro_fsp_16mb/target.cfg
+++ b/config/coreboot/dell3050micro_fsp_16mb/target.cfg
@ -6,6 +6,5 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="3050micro"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
+build_depend="seabios/default grub/xhci memtest86plus"
 IFD_platform="sklkbl"
-payload_uboot_amd64="y"
--- a/config/coreboot/dell7010sff_12mb/target.cfg
+++ b/config/coreboot/dell7010sff_12mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="t1650"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/dell780mt_8mb/target.cfg
+++ b/config/coreboot/dell780mt_8mb/target.cfg
@ -5,5 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/dell780mt_truncate_8mb/target.cfg
+++ b/config/coreboot/dell780mt_truncate_8mb/target.cfg
@ -5,5 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/dell780usff_8mb/target.cfg
+++ b/config/coreboot/dell780usff_8mb/target.cfg
@ -5,5 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/dell780usff_truncate_8mb/target.cfg
+++ b/config/coreboot/dell780usff_truncate_8mb/target.cfg
@ -5,5 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci ata"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/dell9020mt_nri_12mb/target.cfg
+++ b/config/coreboot/dell9020mt_nri_12mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/xhci memtest86plus"
--- a/config/coreboot/dell9020sff_nri_12mb/target.cfg
+++ b/config/coreboot/dell9020sff_nri_12mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/xhci memtest86plus"
--- a/config/coreboot/e4300_4mb/target.cfg
+++ b/config/coreboot/e4300_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/e5420_6mb/target.cfg
+++ b/config/coreboot/e5420_6mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e5520_6mb/target.cfg
+++ b/config/coreboot/e5520_6mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e5530_12mb/target.cfg
+++ b/config/coreboot/e5530_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6220_10mb/target.cfg
+++ b/config/coreboot/e6220_10mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6230_12mb/target.cfg
+++ b/config/coreboot/e6230_12mb/target.cfg
@ -5,5 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6320_10mb/target.cfg
+++ b/config/coreboot/e6320_10mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6330_12mb/target.cfg
+++ b/config/coreboot/e6330_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/coreboot/e6400_4mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="e6400"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6400nvidia_4mb/target.cfg
+++ b/config/coreboot/e6400nvidia_4mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="e6400"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6420_10mb/target.cfg
+++ b/config/coreboot/e6420_10mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6430_12mb/target.cfg
+++ b/config/coreboot/e6430_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6520_10mb/target.cfg
+++ b/config/coreboot/e6520_10mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/e6530_12mb/target.cfg
+++ b/config/coreboot/e6530_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/g43t_am3/target.cfg
+++ b/config/coreboot/g43t_am3/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/g43t_am3_16mb/target.cfg
+++ b/config/coreboot/g43t_am3_16mb/target.cfg
@ -4,5 +4,4 @@ payload_seabios="y"
 payload_memtest="y"
 release="n"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/hp2170p_16mb/target.cfg
+++ b/config/coreboot/hp2170p_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2170p"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp2560p_8mb/target.cfg
+++ b/config/coreboot/hp2560p_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2560p"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp2570p_16mb/target.cfg
+++ b/config/coreboot/hp2570p_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2570p"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp8200sff_4mb/target.cfg
+++ b/config/coreboot/hp8200sff_4mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hp8200sff"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/hp8200sff_8mb/target.cfg
+++ b/config/coreboot/hp8200sff_8mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hp8200sff"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/hp820g2_12mb/target.cfg
+++ b/config/coreboot/hp820g2_12mb/target.cfg
@ -7,5 +7,4 @@ release="n"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="hp820g2"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/xhci memtest86plus"
--- a/config/coreboot/hp8300cmt_16mb/target.cfg
+++ b/config/coreboot/hp8300cmt_16mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="ivybridge"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/hp8300usdt_16mb/target.cfg
+++ b/config/coreboot/hp8300usdt_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/coreboot/hp8460pintel_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8460pintel"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/coreboot/hp8470pintel_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8470pintel"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp8560w_8mb/target.cfg
+++ b/config/coreboot/hp8560w_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8560w"
-payload_uboot_amd64="y"
--- a/config/coreboot/hp9470m_16mb/target.cfg
+++ b/config/coreboot/hp9470m_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp9470m"
-payload_uboot_amd64="y"
--- a/config/coreboot/kcma_d8_16mb/target.cfg
+++ b/config/coreboot/kcma_d8_16mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/kcma_d8_2mb/target.cfg
+++ b/config/coreboot/kcma_d8_2mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/kfsn4_dre_1mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_1mb/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 xlang="c"
-build_depend="seabios/default memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default memtest86plus"
--- a/config/coreboot/kfsn4_dre_2mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_2mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 xlang="c"
-payload_uboot_amd64="y"
--- a/config/coreboot/kgpe_d16_16mb/target.cfg
+++ b/config/coreboot/kgpe_d16_16mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/kgpe_d16_2mb/target.cfg
+++ b/config/coreboot/kgpe_d16_2mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/coreboot/macbook11/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+build_depend="seabios/default grub/default"
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/coreboot/macbook11_16mb/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 scan_scan_disk="ahci"
-build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+build_depend="seabios/default grub/default"
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/coreboot/macbook21/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/coreboot/macbook21_16mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/qemu_x86_64_12mb/target.cfg
+++ b/config/coreboot/qemu_x86_64_12mb/target.cfg
@ -3,4 +3,5 @@ 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"
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/coreboot/r400_16mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/coreboot/r400_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/coreboot/r400_8mb/target.cfg
@ -3,4 +3,3 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-payload_uboot_amd64="y"
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/coreboot/r500_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t1650_12mb/target.cfg
+++ b/config/coreboot/t1650_12mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="t1650"
-build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/nvme memtest86plus"
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/coreboot/t400_16mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/coreboot/t400_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/coreboot/t400_8mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t420_8mb/target.cfg
+++ b/config/coreboot/t420_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/t420s_8mb/target.cfg
+++ b/config/coreboot/t420s_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/t430_12mb/target.cfg
+++ b/config/coreboot/t430_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/t440plibremrc_12mb/target.cfg
+++ b/config/coreboot/t440plibremrc_12mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/xhci memtest86plus"
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/coreboot/t500_16mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/coreboot/t500_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/coreboot/t500_8mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/t520_8mb/target.cfg
+++ b/config/coreboot/t520_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/t530_12mb/target.cfg
+++ b/config/coreboot/t530_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+build_depend="seabios/default grub/default"
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+build_depend="seabios/default grub/default"
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/coreboot/w500_16mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/coreboot/w500_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/coreboot/w500_8mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/w530_12mb/target.cfg
+++ b/config/coreboot/w530_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/w541_12mb/target.cfg
+++ b/config/coreboot/w541_12mb/target.cfg
@ -6,5 +6,4 @@ payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/xhci memtest86plus"
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/coreboot/x200_16mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/coreboot/x200_4mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/coreboot/x200_8mb/target.cfg
@ -4,4 +4,3 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/x220_8mb/target.cfg
+++ b/config/coreboot/x220_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/x230_12mb/target.cfg
+++ b/config/coreboot/x230_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/x230_16mb/target.cfg
+++ b/config/coreboot/x230_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/x230t_12mb/target.cfg
+++ b/config/coreboot/x230t_12mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/x230t_16mb/target.cfg
+++ b/config/coreboot/x230t_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/coreboot/x301_16mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/coreboot/x301_4mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/coreboot/x301_8mb/target.cfg
@ -5,4 +5,3 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+build_depend="seabios/default grub/default"
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@ -3,5 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+build_depend="seabios/default grub/default"
--- 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 u-boot/amd64coreboot"
+build_depend="seabios/default grub/default memtest86plus"

 seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"

--- a/config/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
+++ b/config/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
@ -1,116 +0,0 @@
-From 13263cb35e8fc82f15aad2c1091f2b05342fbe0f Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Wed, 1 Nov 2023 12:04:42 -0600
-Subject: [PATCH 1/1] x86: serial: ns16550: Allow the UART to be silently
- disabled
-
-U-Boot normally requires a UART. When booting from coreboot it is
-sometimes just not available, e.g. when no sysinfo or DBG2 information
-is provided.
-
-In this case we need to continue running, since the display can be used.
-Add a flag to disable serial for this case.
-
-This allows U-Boot to start up and operation from the display, instead
-of hanging on start-up.
-
-This could perhaps be hidden behind a Kconfig option to reduce code
-size.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
---
- drivers/serial/ns16550.c         | 17 +++++++++++++++--
- drivers/serial/serial_coreboot.c |  1 +
- include/ns16550.h                |  1 +
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
-index 6fcb5b523a..891124fc62 100644
--- a/drivers/serial/ns16550.c
-+++ b/drivers/serial/ns16550.c
-@@ -384,6 +384,8 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch)
- {
- 	struct ns16550 *const com_port = dev_get_priv(dev);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
- 	if (!(serial_in(&com_port->lsr) & UART_LSR_THRE))
- 		return -EAGAIN;
- 	serial_out(ch, &com_port->thr);
-@@ -404,6 +406,9 @@ static int ns16550_serial_pending(struct udevice *dev, bool input)
- {
- 	struct ns16550 *const com_port = dev_get_priv(dev);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
-+
- 	if (input)
- 		return (serial_in(&com_port->lsr) & UART_LSR_DR) ? 1 : 0;
- 	else
-@@ -414,6 +419,9 @@ static int ns16550_serial_getc(struct udevice *dev)
- {
- 	struct ns16550 *const com_port = dev_get_priv(dev);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
-+
- 	if (!(serial_in(&com_port->lsr) & UART_LSR_DR))
- 		return -EAGAIN;
- 
-@@ -428,7 +436,8 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
- 
- 	clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate);
- 
-	ns16550_setbrg(com_port, clock_divisor);
-+	if (!(plat->flags & NS16550_FLAG_DISABLE))
-+		ns16550_setbrg(com_port, clock_divisor);
- 
- 	return 0;
- }
-@@ -441,6 +450,9 @@ static int ns16550_serial_setconfig(struct udevice *dev, uint serial_config)
- 	uint bits = SERIAL_GET_BITS(serial_config);
- 	uint stop = SERIAL_GET_STOP(serial_config);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
-+
- 	/*
- 	 * only parity config is implemented, check if other serial settings
- 	 * are the default one.
-@@ -533,7 +545,8 @@ int ns16550_serial_probe(struct udevice *dev)
- 		reset_deassert_bulk(&reset_bulk);
- 
- 	com_port->plat = dev_get_plat(dev);
-	ns16550_init(com_port, -1);
-+	if (!(plat->flags & NS16550_FLAG_DISABLE))
-+		ns16550_init(com_port, -1);
- 
- 	return 0;
- }
-diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
-index b1f69f6998..a885809abd 100644
--- a/drivers/serial/serial_coreboot.c
-+++ b/drivers/serial/serial_coreboot.c
-@@ -119,6 +119,7 @@ static int coreboot_of_to_plat(struct udevice *dev)
- 		 * there is no UART, which may panic. So stay silent and
- 		 * pray that the video console will work.
- 		 */
-+		plat->flags |= NS16550_FLAG_DISABLE;
- 		log_debug("Cannot detect UART\n");
- 	}
- 
-diff --git a/include/ns16550.h b/include/ns16550.h
-index 7f48130008..3c4f3e7539 100644
--- a/include/ns16550.h
-+++ b/include/ns16550.h
-@@ -52,6 +52,7 @@ enum ns16550_flags {
- 	NS16550_FLAG_IO		= 1 << 0, /* Use I/O access (else mem-mapped) */
- 	NS16550_FLAG_ENDIAN	= 1 << 1, /* Use out_le/be_32() */
- 	NS16550_FLAG_BE		= 1 << 2, /* Big-endian access (else little) */
-+	NS16550_FLAG_DISABLE	= BIT(3), /* No output or input */
- };
- 
- /**
-- 
-2.39.5
-
--- a/config/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
+++ b/config/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
@ -1,116 +0,0 @@
-From 13263cb35e8fc82f15aad2c1091f2b05342fbe0f Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Wed, 1 Nov 2023 12:04:42 -0600
-Subject: [PATCH 1/1] x86: serial: ns16550: Allow the UART to be silently
- disabled
-
-U-Boot normally requires a UART. When booting from coreboot it is
-sometimes just not available, e.g. when no sysinfo or DBG2 information
-is provided.
-
-In this case we need to continue running, since the display can be used.
-Add a flag to disable serial for this case.
-
-This allows U-Boot to start up and operation from the display, instead
-of hanging on start-up.
-
-This could perhaps be hidden behind a Kconfig option to reduce code
-size.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
---
- drivers/serial/ns16550.c         | 17 +++++++++++++++--
- drivers/serial/serial_coreboot.c |  1 +
- include/ns16550.h                |  1 +
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
-index 6fcb5b523a..891124fc62 100644
--- a/drivers/serial/ns16550.c
-+++ b/drivers/serial/ns16550.c
-@@ -384,6 +384,8 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch)
- {
- 	struct ns16550 *const com_port = dev_get_priv(dev);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
- 	if (!(serial_in(&com_port->lsr) & UART_LSR_THRE))
- 		return -EAGAIN;
- 	serial_out(ch, &com_port->thr);
-@@ -404,6 +406,9 @@ static int ns16550_serial_pending(struct udevice *dev, bool input)
- {
- 	struct ns16550 *const com_port = dev_get_priv(dev);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
-+
- 	if (input)
- 		return (serial_in(&com_port->lsr) & UART_LSR_DR) ? 1 : 0;
- 	else
-@@ -414,6 +419,9 @@ static int ns16550_serial_getc(struct udevice *dev)
- {
- 	struct ns16550 *const com_port = dev_get_priv(dev);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
-+
- 	if (!(serial_in(&com_port->lsr) & UART_LSR_DR))
- 		return -EAGAIN;
- 
-@@ -428,7 +436,8 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
- 
- 	clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate);
- 
-	ns16550_setbrg(com_port, clock_divisor);
-+	if (!(plat->flags & NS16550_FLAG_DISABLE))
-+		ns16550_setbrg(com_port, clock_divisor);
- 
- 	return 0;
- }
-@@ -441,6 +450,9 @@ static int ns16550_serial_setconfig(struct udevice *dev, uint serial_config)
- 	uint bits = SERIAL_GET_BITS(serial_config);
- 	uint stop = SERIAL_GET_STOP(serial_config);
- 
-+	if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+		return 0;
-+
- 	/*
- 	 * only parity config is implemented, check if other serial settings
- 	 * are the default one.
-@@ -533,7 +545,8 @@ int ns16550_serial_probe(struct udevice *dev)
- 		reset_deassert_bulk(&reset_bulk);
- 
- 	com_port->plat = dev_get_plat(dev);
-	ns16550_init(com_port, -1);
-+	if (!(plat->flags & NS16550_FLAG_DISABLE))
-+		ns16550_init(com_port, -1);
- 
- 	return 0;
- }
-diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
-index b1f69f6998..a885809abd 100644
--- a/drivers/serial/serial_coreboot.c
-+++ b/drivers/serial/serial_coreboot.c
-@@ -119,6 +119,7 @@ static int coreboot_of_to_plat(struct udevice *dev)
- 		 * there is no UART, which may panic. So stay silent and
- 		 * pray that the video console will work.
- 		 */
-+		plat->flags |= NS16550_FLAG_DISABLE;
- 		log_debug("Cannot detect UART\n");
- 	}
- 
-diff --git a/include/ns16550.h b/include/ns16550.h
-index 7f48130008..3c4f3e7539 100644
--- a/include/ns16550.h
-+++ b/include/ns16550.h
-@@ -52,6 +52,7 @@ enum ns16550_flags {
- 	NS16550_FLAG_IO		= 1 << 0, /* Use I/O access (else mem-mapped) */
- 	NS16550_FLAG_ENDIAN	= 1 << 1, /* Use out_le/be_32() */
- 	NS16550_FLAG_BE		= 1 << 2, /* Big-endian access (else little) */
-+	NS16550_FLAG_DISABLE	= BIT(3), /* No output or input */
- };
- 
- /**
-- 
-2.39.5
-