From 8c3f10ba402e7535529decf008cfd3dbd39d9d7e Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 03:09:29 +0100
Subject: rom.sh: simplify u-boot payload handling

define it with a single variable, rather than several.

this allows several checks to be greatly simplified.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 config/coreboot/dell3050micro_vfsp_16mb/target.cfg |  2 +-
 config/coreboot/dell7010sff_12mb/target.cfg        |  2 +-
 config/coreboot/dell780mt_8mb/target.cfg           |  2 +-
 config/coreboot/dell780mt_truncate_8mb/target.cfg  |  2 +-
 config/coreboot/dell780usff_8mb/target.cfg         |  2 +-
 .../coreboot/dell780usff_truncate_8mb/target.cfg   |  2 +-
 config/coreboot/dell9020mt_nri_12mb/target.cfg     |  2 +-
 config/coreboot/dell9020sff_nri_12mb/target.cfg    |  2 +-
 config/coreboot/e4300_4mb/target.cfg               |  2 +-
 config/coreboot/e5420_6mb/target.cfg               |  2 +-
 config/coreboot/e5520_6mb/target.cfg               |  2 +-
 config/coreboot/e5530_12mb/target.cfg              |  2 +-
 config/coreboot/e6220_10mb/target.cfg              |  2 +-
 config/coreboot/e6230_12mb/target.cfg              |  4 +--
 config/coreboot/e6320_10mb/target.cfg              |  2 +-
 config/coreboot/e6330_12mb/target.cfg              |  2 +-
 config/coreboot/e6400_4mb/target.cfg               |  2 +-
 config/coreboot/e6420_10mb/target.cfg              |  2 +-
 config/coreboot/e6430_12mb/target.cfg              |  2 +-
 config/coreboot/e6520_10mb/target.cfg              |  2 +-
 config/coreboot/e6530_12mb/target.cfg              |  2 +-
 config/coreboot/g43t_am3/target.cfg                |  2 +-
 config/coreboot/g43t_am3_16mb/target.cfg           |  2 +-
 config/coreboot/gru_bob/target.cfg                 |  2 +-
 config/coreboot/gru_kevin/target.cfg               |  2 +-
 config/coreboot/hp2170p_16mb/target.cfg            |  2 +-
 config/coreboot/hp2560p_8mb/target.cfg             |  2 +-
 config/coreboot/hp2570p_16mb/target.cfg            |  2 +-
 config/coreboot/hp8200sff_4mb/target.cfg           |  2 +-
 config/coreboot/hp8200sff_8mb/target.cfg           |  2 +-
 config/coreboot/hp820g2_12mb/target.cfg            |  2 +-
 config/coreboot/hp8300cmt_16mb/target.cfg          |  2 +-
 config/coreboot/hp8300usdt_16mb/target.cfg         |  2 +-
 config/coreboot/hp8460pintel_8mb/target.cfg        |  2 +-
 config/coreboot/hp8470pintel_16mb/target.cfg       |  2 +-
 config/coreboot/hp9470m_16mb/target.cfg            |  2 +-
 config/coreboot/kcma_d8_16mb/target.cfg            |  2 +-
 config/coreboot/kcma_d8_2mb/target.cfg             |  2 +-
 config/coreboot/kfsn4_dre_1mb/target.cfg           |  2 +-
 config/coreboot/kfsn4_dre_2mb/target.cfg           |  2 +-
 config/coreboot/kgpe_d16_16mb/target.cfg           |  2 +-
 config/coreboot/kgpe_d16_2mb/target.cfg            |  2 +-
 config/coreboot/macbook11/target.cfg               |  2 +-
 config/coreboot/macbook11_16mb/target.cfg          |  2 +-
 config/coreboot/macbook21/target.cfg               |  2 +-
 config/coreboot/macbook21_16mb/target.cfg          |  2 +-
 config/coreboot/q45t_am/target.cfg                 |  2 +-
 config/coreboot/qemu_arm64_12mb/target.cfg         |  2 +-
 config/coreboot/qemu_x86_12mb/target.cfg           |  2 +-
 config/coreboot/qemu_x86_64_12mb/target.cfg        |  2 +-
 config/coreboot/r400_16mb/target.cfg               |  2 +-
 config/coreboot/r400_4mb/target.cfg                |  2 +-
 config/coreboot/r400_8mb/target.cfg                |  2 +-
 config/coreboot/r500_4mb/target.cfg                |  2 +-
 config/coreboot/t1650_12mb/target.cfg              |  2 +-
 config/coreboot/t1700mt_bmrc_12mb/target.cfg       |  2 +-
 config/coreboot/t1700sff_bmrc_12mb/target.cfg      |  2 +-
 config/coreboot/t400_16mb/target.cfg               |  2 +-
 config/coreboot/t400_4mb/target.cfg                |  2 +-
 config/coreboot/t400_8mb/target.cfg                |  2 +-
 config/coreboot/t420_8mb/target.cfg                |  2 +-
 config/coreboot/t420s_8mb/target.cfg               |  2 +-
 config/coreboot/t430_12mb/target.cfg               |  2 +-
 config/coreboot/t440plibremrc_12mb/target.cfg      |  2 +-
 config/coreboot/t500_16mb/target.cfg               |  2 +-
 config/coreboot/t500_4mb/target.cfg                |  2 +-
 config/coreboot/t500_8mb/target.cfg                |  2 +-
 config/coreboot/t520_8mb/target.cfg                |  2 +-
 config/coreboot/t530_12mb/target.cfg               |  2 +-
 config/coreboot/t60_16mb_intelgpu/target.cfg       |  2 +-
 config/coreboot/t60_intelgpu/target.cfg            |  2 +-
 config/coreboot/w500_16mb/target.cfg               |  2 +-
 config/coreboot/w500_4mb/target.cfg                |  2 +-
 config/coreboot/w500_8mb/target.cfg                |  2 +-
 config/coreboot/w530_12mb/target.cfg               |  2 +-
 config/coreboot/w541_12mb/target.cfg               |  2 +-
 config/coreboot/x200_16mb/target.cfg               |  2 +-
 config/coreboot/x200_4mb/target.cfg                |  2 +-
 config/coreboot/x200_8mb/target.cfg                |  2 +-
 config/coreboot/x220_8mb/target.cfg                |  2 +-
 config/coreboot/x230_12mb/target.cfg               |  2 +-
 config/coreboot/x230_16mb/target.cfg               |  2 +-
 config/coreboot/x230t_12mb/target.cfg              |  2 +-
 config/coreboot/x230t_16mb/target.cfg              |  2 +-
 config/coreboot/x301_16mb/target.cfg               |  2 +-
 config/coreboot/x301_4mb/target.cfg                |  2 +-
 config/coreboot/x301_8mb/target.cfg                |  2 +-
 config/coreboot/x60/target.cfg                     |  2 +-
 config/coreboot/x60_16mb/target.cfg                |  2 +-
 config/data/coreboot/mkhelper.cfg                  |  5 ++-
 include/rom.sh                                     | 37 +++++++++-------------
 91 files changed, 107 insertions(+), 115 deletions(-)

diff --git a/config/coreboot/dell3050micro_vfsp_16mb/target.cfg b/config/coreboot/dell3050micro_vfsp_16mb/target.cfg
index f86065a1..e100fbed 100644
--- a/config/coreboot/dell3050micro_vfsp_16mb/target.cfg
+++ b/config/coreboot/dell3050micro_vfsp_16mb/target.cfg
@@ -10,4 +10,4 @@ grubtree="xhci"
 vcfg="3050micro"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
 IFD_platform="sklkbl"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell7010sff_12mb/target.cfg b/config/coreboot/dell7010sff_12mb/target.cfg
index de6a8af8..34865f86 100644
--- a/config/coreboot/dell7010sff_12mb/target.cfg
+++ b/config/coreboot/dell7010sff_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="t1650"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell780mt_8mb/target.cfg b/config/coreboot/dell780mt_8mb/target.cfg
index 45b8ea0b..a58de7bd 100644
--- a/config/coreboot/dell780mt_8mb/target.cfg
+++ b/config/coreboot/dell780mt_8mb/target.cfg
@@ -8,4 +8,4 @@ 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"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell780mt_truncate_8mb/target.cfg b/config/coreboot/dell780mt_truncate_8mb/target.cfg
index 45b8ea0b..a58de7bd 100644
--- a/config/coreboot/dell780mt_truncate_8mb/target.cfg
+++ b/config/coreboot/dell780mt_truncate_8mb/target.cfg
@@ -8,4 +8,4 @@ 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"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell780usff_8mb/target.cfg b/config/coreboot/dell780usff_8mb/target.cfg
index 45b8ea0b..a58de7bd 100644
--- a/config/coreboot/dell780usff_8mb/target.cfg
+++ b/config/coreboot/dell780usff_8mb/target.cfg
@@ -8,4 +8,4 @@ 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"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell780usff_truncate_8mb/target.cfg b/config/coreboot/dell780usff_truncate_8mb/target.cfg
index 45b8ea0b..a58de7bd 100644
--- a/config/coreboot/dell780usff_truncate_8mb/target.cfg
+++ b/config/coreboot/dell780usff_truncate_8mb/target.cfg
@@ -8,4 +8,4 @@ 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"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell9020mt_nri_12mb/target.cfg b/config/coreboot/dell9020mt_nri_12mb/target.cfg
index 96fbb9e3..7c26ae5e 100644
--- a/config/coreboot/dell9020mt_nri_12mb/target.cfg
+++ b/config/coreboot/dell9020mt_nri_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/dell9020sff_nri_12mb/target.cfg b/config/coreboot/dell9020sff_nri_12mb/target.cfg
index 96fbb9e3..7c26ae5e 100644
--- a/config/coreboot/dell9020sff_nri_12mb/target.cfg
+++ b/config/coreboot/dell9020sff_nri_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e4300_4mb/target.cfg b/config/coreboot/e4300_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/e4300_4mb/target.cfg
+++ b/config/coreboot/e4300_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e5420_6mb/target.cfg b/config/coreboot/e5420_6mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/e5420_6mb/target.cfg
+++ b/config/coreboot/e5420_6mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e5520_6mb/target.cfg b/config/coreboot/e5520_6mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/e5520_6mb/target.cfg
+++ b/config/coreboot/e5520_6mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e5530_12mb/target.cfg b/config/coreboot/e5530_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/e5530_12mb/target.cfg
+++ b/config/coreboot/e5530_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6220_10mb/target.cfg b/config/coreboot/e6220_10mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/e6220_10mb/target.cfg
+++ b/config/coreboot/e6220_10mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6230_12mb/target.cfg b/config/coreboot/e6230_12mb/target.cfg
index b491fdc8..42eca05e 100644
--- a/config/coreboot/e6230_12mb/target.cfg
+++ b/config/coreboot/e6230_12mb/target.cfg
@@ -7,5 +7,5 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6320_10mb/target.cfg b/config/coreboot/e6320_10mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/e6320_10mb/target.cfg
+++ b/config/coreboot/e6320_10mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6330_12mb/target.cfg b/config/coreboot/e6330_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/e6330_12mb/target.cfg
+++ b/config/coreboot/e6330_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg
index b999b10c..f7500e97 100644
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/coreboot/e6400_4mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="e6400"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6420_10mb/target.cfg b/config/coreboot/e6420_10mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/e6420_10mb/target.cfg
+++ b/config/coreboot/e6420_10mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/coreboot/e6430_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/e6430_12mb/target.cfg
+++ b/config/coreboot/e6430_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6520_10mb/target.cfg b/config/coreboot/e6520_10mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/e6520_10mb/target.cfg
+++ b/config/coreboot/e6520_10mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/coreboot/e6530_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/e6530_12mb/target.cfg
+++ b/config/coreboot/e6530_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/g43t_am3/target.cfg b/config/coreboot/g43t_am3/target.cfg
index 3379b716..357eee9a 100644
--- a/config/coreboot/g43t_am3/target.cfg
+++ b/config/coreboot/g43t_am3/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_memtest="y"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/g43t_am3_16mb/target.cfg b/config/coreboot/g43t_am3_16mb/target.cfg
index f2f0a52d..a097a3e8 100644
--- a/config/coreboot/g43t_am3_16mb/target.cfg
+++ b/config/coreboot/g43t_am3_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_memtest="y"
 release="n"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg
index e5866cb7..dda11b5f 100644
--- a/config/coreboot/gru_bob/target.cfg
+++ b/config/coreboot/gru_bob/target.cfg
@@ -2,5 +2,5 @@
 
 tree="default"
 xarch="aarch64-elf arm-eabi"
-payload_uboot="y"
+payload_uboot="arm64"
 build_depend="u-boot/gru_bob"
diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg
index 81a93f27..26fd442b 100644
--- a/config/coreboot/gru_kevin/target.cfg
+++ b/config/coreboot/gru_kevin/target.cfg
@@ -2,5 +2,5 @@
 
 tree="default"
 xarch="aarch64-elf arm-eabi"
-payload_uboot="y"
+payload_uboot="arm64"
 build_depend="u-boot/gru_kevin"
diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg
index e1cffa41..d6868831 100644
--- a/config/coreboot/hp2170p_16mb/target.cfg
+++ b/config/coreboot/hp2170p_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2170p"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg
index 5715390e..fce385d9 100644
--- a/config/coreboot/hp2560p_8mb/target.cfg
+++ b/config/coreboot/hp2560p_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2560p"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg
index fb5d41e1..26c80f5f 100644
--- a/config/coreboot/hp2570p_16mb/target.cfg
+++ b/config/coreboot/hp2570p_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp2570p"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg
index 521ba0ec..76effd9f 100644
--- a/config/coreboot/hp8200sff_4mb/target.cfg
+++ b/config/coreboot/hp8200sff_4mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hp8200sff"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg
index 521ba0ec..76effd9f 100644
--- a/config/coreboot/hp8200sff_8mb/target.cfg
+++ b/config/coreboot/hp8200sff_8mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="hp8200sff"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/coreboot/hp820g2_12mb/target.cfg
index 7fe45119..66d0433e 100644
--- a/config/coreboot/hp820g2_12mb/target.cfg
+++ b/config/coreboot/hp820g2_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="hp820g2"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg
index 5bd323c9..f3fb43a7 100644
--- a/config/coreboot/hp8300cmt_16mb/target.cfg
+++ b/config/coreboot/hp8300cmt_16mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="ivybridge"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/hp8300usdt_16mb/target.cfg
+++ b/config/coreboot/hp8300usdt_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg
index d6179420..255bfac7 100644
--- a/config/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/coreboot/hp8460pintel_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8460pintel"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg
index 65828b25..01b2ed5b 100644
--- a/config/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/coreboot/hp8470pintel_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8470pintel"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg
index e4dbdc93..6ebd81c5 100644
--- a/config/coreboot/hp9470m_16mb/target.cfg
+++ b/config/coreboot/hp9470m_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp9470m"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/kcma_d8_16mb/target.cfg b/config/coreboot/kcma_d8_16mb/target.cfg
index 112c101f..75955f7e 100644
--- a/config/coreboot/kcma_d8_16mb/target.cfg
+++ b/config/coreboot/kcma_d8_16mb/target.cfg
@@ -9,4 +9,4 @@ xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/kcma_d8_2mb/target.cfg b/config/coreboot/kcma_d8_2mb/target.cfg
index 112c101f..75955f7e 100644
--- a/config/coreboot/kcma_d8_2mb/target.cfg
+++ b/config/coreboot/kcma_d8_2mb/target.cfg
@@ -9,4 +9,4 @@ xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/kfsn4_dre_1mb/target.cfg b/config/coreboot/kfsn4_dre_1mb/target.cfg
index a87ac1ad..c4536856 100644
--- a/config/coreboot/kfsn4_dre_1mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_1mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_memtest="y"
 xlang="c"
 build_depend="seabios/default memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/kfsn4_dre_2mb/target.cfg b/config/coreboot/kfsn4_dre_2mb/target.cfg
index 17021b47..f942604b 100644
--- a/config/coreboot/kfsn4_dre_2mb/target.cfg
+++ b/config/coreboot/kfsn4_dre_2mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 xlang="c"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/kgpe_d16_16mb/target.cfg b/config/coreboot/kgpe_d16_16mb/target.cfg
index 112c101f..75955f7e 100644
--- a/config/coreboot/kgpe_d16_16mb/target.cfg
+++ b/config/coreboot/kgpe_d16_16mb/target.cfg
@@ -9,4 +9,4 @@ xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/kgpe_d16_2mb/target.cfg b/config/coreboot/kgpe_d16_2mb/target.cfg
index 112c101f..75955f7e 100644
--- a/config/coreboot/kgpe_d16_2mb/target.cfg
+++ b/config/coreboot/kgpe_d16_2mb/target.cfg
@@ -9,4 +9,4 @@ xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg
index c1e3a3c6..f41e3fe9 100644
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/coreboot/macbook11/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
 build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg
index e0d1afbf..ff2498eb 100644
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/coreboot/macbook11_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 scan_scan_disk="ahci"
 build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/coreboot/macbook21/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/coreboot/macbook21_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/q45t_am/target.cfg b/config/coreboot/q45t_am/target.cfg
index 3379b716..357eee9a 100644
--- a/config/coreboot/q45t_am/target.cfg
+++ b/config/coreboot/q45t_am/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_memtest="y"
 grubtree="nvme"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/coreboot/qemu_arm64_12mb/target.cfg
index 5d8f0db2..2ea9482f 100644
--- a/config/coreboot/qemu_arm64_12mb/target.cfg
+++ b/config/coreboot/qemu_arm64_12mb/target.cfg
@@ -2,5 +2,5 @@
 
 tree="default"
 xarch="aarch64-elf arm-eabi"
-payload_uboot="y"
+payload_uboot="arm64"
 build_depend="u-boot/qemu_arm64_12mb"
diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg
index 2074beca..476a98cb 100644
--- a/config/coreboot/qemu_x86_12mb/target.cfg
+++ b/config/coreboot/qemu_x86_12mb/target.cfg
@@ -6,4 +6,4 @@ payload_grub="y"
 payload_seabios="y"
 payload_memtest="y"
 build_depend="seabios/default grub/default memtest86plus u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/coreboot/qemu_x86_64_12mb/target.cfg b/config/coreboot/qemu_x86_64_12mb/target.cfg
index 7855bd6f..61ae6299 100644
--- a/config/coreboot/qemu_x86_64_12mb/target.cfg
+++ b/config/coreboot/qemu_x86_64_12mb/target.cfg
@@ -5,4 +5,4 @@ xarch="i386-elf"
 payload_grub="y"
 payload_seabios="y"
 payload_memtest="y"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/coreboot/r400_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/coreboot/r400_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg
index ef878ea1..23bfb335 100644
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/coreboot/r400_8mb/target.cfg
@@ -5,4 +5,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/coreboot/r500_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg
index de6a8af8..34865f86 100644
--- a/config/coreboot/t1650_12mb/target.cfg
+++ b/config/coreboot/t1650_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="nvme"
 vcfg="t1650"
 build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t1700mt_bmrc_12mb/target.cfg b/config/coreboot/t1700mt_bmrc_12mb/target.cfg
index 06de408c..5fd0d500 100644
--- a/config/coreboot/t1700mt_bmrc_12mb/target.cfg
+++ b/config/coreboot/t1700mt_bmrc_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="t1700"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t1700sff_bmrc_12mb/target.cfg b/config/coreboot/t1700sff_bmrc_12mb/target.cfg
index 06de408c..5fd0d500 100644
--- a/config/coreboot/t1700sff_bmrc_12mb/target.cfg
+++ b/config/coreboot/t1700sff_bmrc_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="t1700"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/coreboot/t400_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/coreboot/t400_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/coreboot/t400_8mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t420_8mb/target.cfg b/config/coreboot/t420_8mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/t420_8mb/target.cfg
+++ b/config/coreboot/t420_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/coreboot/t420s_8mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/t420s_8mb/target.cfg
+++ b/config/coreboot/t420s_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t430_12mb/target.cfg b/config/coreboot/t430_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/t430_12mb/target.cfg
+++ b/config/coreboot/t430_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg
index 96fbb9e3..7c26ae5e 100644
--- a/config/coreboot/t440plibremrc_12mb/target.cfg
+++ b/config/coreboot/t440plibremrc_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/coreboot/t500_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/coreboot/t500_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/coreboot/t500_8mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t520_8mb/target.cfg b/config/coreboot/t520_8mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/t520_8mb/target.cfg
+++ b/config/coreboot/t520_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t530_12mb/target.cfg b/config/coreboot/t530_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/t530_12mb/target.cfg
+++ b/config/coreboot/t530_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg
index c1e3a3c6..f41e3fe9 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
 build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg
index c1e3a3c6..f41e3fe9 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
 build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/coreboot/w500_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/coreboot/w500_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/coreboot/w500_8mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/w530_12mb/target.cfg b/config/coreboot/w530_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/w530_12mb/target.cfg
+++ b/config/coreboot/w530_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg
index 96fbb9e3..7c26ae5e 100644
--- a/config/coreboot/w541_12mb/target.cfg
+++ b/config/coreboot/w541_12mb/target.cfg
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
 grubtree="xhci"
 vcfg="haswell"
 build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/coreboot/x200_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/coreboot/x200_4mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg
index 53a597b6..f4d81d19 100644
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/coreboot/x200_8mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x220_8mb/target.cfg b/config/coreboot/x220_8mb/target.cfg
index 333030ce..d7510b96 100644
--- a/config/coreboot/x220_8mb/target.cfg
+++ b/config/coreboot/x220_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="sandybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x230_12mb/target.cfg b/config/coreboot/x230_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/x230_12mb/target.cfg
+++ b/config/coreboot/x230_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x230_16mb/target.cfg b/config/coreboot/x230_16mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/x230_16mb/target.cfg
+++ b/config/coreboot/x230_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/coreboot/x230t_12mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/x230t_12mb/target.cfg
+++ b/config/coreboot/x230t_12mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/coreboot/x230t_16mb/target.cfg
index 6cbab731..595ad782 100644
--- a/config/coreboot/x230t_16mb/target.cfg
+++ b/config/coreboot/x230t_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="ivybridge"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg
index 4d4a4c25..31e9f759 100644
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/coreboot/x301_16mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg
index 4d4a4c25..31e9f759 100644
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/coreboot/x301_4mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg
index 4d4a4c25..31e9f759 100644
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/coreboot/x301_8mb/target.cfg
@@ -7,4 +7,4 @@ payload_grub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"
-payload_uboot_amd64="y"
+payload_uboot="amd64"
diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg
index c1e3a3c6..f41e3fe9 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
 build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg
index c1e3a3c6..f41e3fe9 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
 payload_grub="y"
 grub_scan_disk="ahci"
 build_depend="seabios/default grub/default u-boot/i386coreboot"
-payload_uboot_i386="y"
+payload_uboot="i386"
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index c993fbd4..630654a0 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -5,10 +5,9 @@ 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`
 
diff --git a/include/rom.sh b/include/rom.sh
index 1c39979d..eedd05d3 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -94,21 +94,16 @@ mkcorebootbin()
 	initmode="${initmode%%_*}"
 	cbfstool="elf/cbfstool/$tree/cbfstool"
 
-	[ "$payload_uboot_i386" = "y" ] && \
-	    [ "$payload_uboot_amd64" = "y" ] && \
-		err "'$target' enables 32- and 64-bit x86 U-Boot"
+	[ -z "$payload_uboot" ] || [ "$payload_uboot" = "amd64" ] || \
+	    [ "$payload_uboot" = "i386" ] || [ "$payload_uboot" = "arm64" ] \
+		|| err "'$target' defines bad u-boot type '$payload_uboot'"
 
-	if [ "$payload_uboot_i386" = "y" ] || \
-	    [ "$payload_uboot_amd64" = "y" ]; then
-		printf "'%s' has x86 U-Boot; assuming SeaBIOS=y\n" \
-		    "$target" 1>&2
+	[ -z "$payload_uboot" ] || [ "$payload_uboot" = "arm64" ] || \
 		payload_seabios="y"
-	fi
 
 	[ -n "$uboot_config" ] || uboot_config="default"
-	[ "$payload_uboot" = "y" ] || payload_seabios="y"
 	[ "$payload_grub" = "y" ] && payload_seabios="y"
-	[ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "y" ] && \
+	[ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "arm64" ] && \
 	    $dry err "$target: U-Boot(arm64) and SeaBIOS/GRUB both enabled."
 
 	[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata"
@@ -126,7 +121,8 @@ mkcorebootbin()
 	if $dry grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then
 		[ "$payload_seabios" = "y" ] && pname="seabios" && \
 		    $dry add_seabios
-		[ "$payload_uboot" = "y" ] && pname="uboot" && $dry add_uboot
+		[ "$payload_uboot" = "arm64" ] && pname="uboot" && \
+		    $dry add_uboot; :
 	else
 		pname="custom"
 		$dry cprom
@@ -135,10 +131,8 @@ mkcorebootbin()
 
 add_seabios()
 {
-	if [ "$payload_uboot_i386" = "y" ] || \
-	    [ "$payload_uboot_amd64" = "y" ]; then
-		$dry add_uboot
-	fi
+	[ -z "$payload_uboot" ] || [ "$payload_uboot" = "arm64" ] || \
+	    $dry add_uboot
 
 	_seabioself="elf/seabios/default/$initmode/bios.bin.elf"
 	_seaname="fallback/payload" && [ "$payload_grubsea" = "y" ] && \
@@ -159,7 +153,7 @@ add_seabios()
 	[ "$payload_grub" = "y" ] && add_grub
 
 	[ "$payload_grubsea" != "y" ] && cprom
-	[ "$payload_uboot_amd64" = "y" ] && [ "$displaymode" != "txtmode" ] && \
+	[ "$payload_uboot" = "amd64" ] && [ "$displaymode" != "txtmode" ] && \
 	    [ "$initmode" != "normal" ] && [ "$payload_grubsea" != "y" ] && \
 	    pname="seauboot" && cprom "seauboot"
 	[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
@@ -206,14 +200,13 @@ add_uboot()
 	ubpath="fallback/payload"
 	ubtarget="$target"
 	# override for x86/x86_64 targets:
-	if [ "$payload_uboot_i386" = "y" ] || \
-	    [ "$payload_uboot_amd64" = "y" ]; then
+	if [ -n "$payload_uboot" ] && [ "$payload_uboot" != "arm64" ]; then
 		ubcbfsargs="-l 0x1110000 -e 0x1110000" # 64-bit and 32-bit
 			# on 64-bit, 0x1120000 is the SPL, and stub before that
 		ubpath="img/u-boot" # 64-bit
 		ubtarget="amd64coreboot"
-		[ "$payload_uboot_i386" = "y" ] && ubpath="u-boot" # 32-bit
-		[ "$payload_uboot_i386" = "y" ] && ubtarget="i386coreboot"; :
+		[ "$payload_uboot" = "i386" ] && ubpath="u-boot" # 32-bit
+		[ "$payload_uboot" = "i386" ] && ubtarget="i386coreboot"; :
 	fi
 
 	ubdir="elf/u-boot/$ubtarget/$uboot_config"
@@ -222,8 +215,8 @@ add_uboot()
 	ubootelf="$ubdir/u-boot.elf" && [ ! -f "$ubootelf" ] && \
 	    ubootelf="$ubdir/u-boot"
 	# override for x86/x86_64 targets:
-	[ "$payload_uboot_i386" = "y" ] && ubootelf="$ubdir/u-boot-dtb.bin"
-	[ "$payload_uboot_amd64" = "y" ] && \
+	[ "$payload_uboot" = "i386" ] && ubootelf="$ubdir/u-boot-dtb.bin"
+	[ "$payload_uboot" = "amd64" ] && \
 	    ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible
 
 	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs
-- 
cgit v1.2.1


From d2e148fdd9d3f341940c22c241d219a0372f8f57 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 04:40:30 +0100
Subject: rom.sh: simplify ccache handling for coreboot

we simply do not need to run the make-oldconfig command
at all, and after removing it, the "cook" function seemed
quite redundant so i merged it with mkvendorfiles()

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/rom.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/include/rom.sh b/include/rom.sh
index eedd05d3..4a3503f4 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -45,7 +45,8 @@ mkpayload_grub()
 
 mkvendorfiles()
 {
-	[ -z "$mode" ] && $dry cook_coreboot_config
+	[ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \
+	    "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; :
 	fx_ check_coreboot_util printf "cbfstool\nifdtool\n"
 	printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \
 	    err "!mk $srcdir .coreboot-version"
@@ -53,14 +54,6 @@ mkvendorfiles()
 	    x_ ./mk download "$target"; :
 }
 
-cook_coreboot_config()
-{
-	[ -f "$srcdir/.config" ] || return 0
-	printf "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || \
-	    err "$srcdir/.config: Could not enable ccache"
-	make -C "$srcdir" oldconfig || err "Could not cook $srcdir/.config"; :
-}
-
 check_coreboot_util()
 {
 	[ "$badhash" = "y" ] && x_ rm -f "elf/$1/$tree/$1"
-- 
cgit v1.2.1


From a47e98117235682e9d1744ddbf1d16523532d96a Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 04:45:23 +0100
Subject: rom.sh: rename mkvendorfiles

it mainly does general tasks, like handling utils
and enabling ccache. the vfiles are a small part.

rename the function accordingly. it is called by
premake, so let's call it corebootpremake.

this change will also make sense when cherry-picked
into cbmk, which does not handle vfiles at all.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 config/data/coreboot/mkhelper.cfg | 2 +-
 include/rom.sh                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 630654a0..da9015f1 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -11,6 +11,6 @@ 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/include/rom.sh b/include/rom.sh
index 4a3503f4..632ecca3 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -43,7 +43,7 @@ mkpayload_grub()
 	    "/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; :
 }
 
-mkvendorfiles()
+corebootpremake()
 {
 	[ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \
 	    "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; :
-- 
cgit v1.2.1


From 97ce531c341f36b1496729e4a0f882b4ad9621b7 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 05:03:03 +0100
Subject: rom.sh: simplify mkcoreboottar()

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/rom.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/rom.sh b/include/rom.sh
index 632ecca3..4ac4c5de 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -253,10 +253,7 @@ cbfs()
 
 mkcoreboottar()
 {
-	[ "$target" = "$tree" ] && return 0
-	[ "$XBMK_RELEASE" = "y" ] || return 0
-	[ "$release" != "n" ] || return 0
-
-	$dry mkrom_tarball "bin/$target"
-	$dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; :
+	[ "$target" != "$tree" ] && [ "$XBMK_RELEASE" = "y" ] && \
+	    [ "$release" != "n" ] && $dry mkrom_tarball "bin/$target" && \
+	    $dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; :
 }
-- 
cgit v1.2.1


From ad333ae24810dcb762d5561d0b7d7dabec7c0eac Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 14:35:02 +0100
Subject: tree.sh: Don't auto-run make-oldconfig

This code was introduced to provide fault tolerance,
so that if I forgot to manually update the configs
myself, builds would still succeed, e.g. coreboot
builds.

However, there have been cases in the past where this
introduces settings we don't want, and in general we
do want to know when there is an error in the configs.

The policy should always be: fail early, fail hard.

This also mitigates bugs in U-Boot's build system; for
example, when I last attempted to update the U-Boot
tree for x86, make-oldconfig introduced a lot of junk
settings unrelated, which then introduced code that
would brick the board if you tried it on one, e.g.
it broke booting most Linux kernels via bootflow.

With this change, U-Boot will be easier to handle,
which normally requires manual configuration; the
automated make-oldconfig reconfiguration feature
breaks U-Boot. This will no longer occur, since we
no longer run it manually.

On the other hand, this feature has also prevented
other disastrous bugs in the past, such as when I
forgot to properly set the SPD size on T480; it was
set to 256 bytes, not 512 as is correct. Therefore,
this new design change means I must also be more
vigilant about config changes in project trees.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/tree.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/tree.sh b/include/tree.sh
index 83887864..8aaadd57 100644
--- a/include/tree.sh
+++ b/include/tree.sh
@@ -279,8 +279,6 @@ handle_makefile()
 	    $dry x_ make -C "$srcdir" $cleanargs clean
 
 	[ -f "$defconfig" ] && x_ cp "$defconfig" "$srcdir/.config"
-	[ -n "$mode" ] || [ -n "$btype" ] || $dry make -C \
-	    "$srcdir" silentoldconfig || make -C "$srcdir" oldconfig || :
 
 	run_make_command || err "handle_makefile $srcdir: no makefile!"
 
-- 
cgit v1.2.1


From 2493203ee53befbf46de0ff7908214b5e64033a8 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 14:46:33 +0100
Subject: get.sh: Properly error out if tmpclone fails

We rely on a non-zero exit on other try_ commands, which
works fine there because we then check the file afterward
and error out accordingly.

For git repositories, we assume that both mirrors are
identical and therefore once we get to the first clone
attempt, we assume that it must succeed.

Therefore, if it does not succeed, we must fail. This fixes
a regression I found in testing, where sometimes a failed
patching attempt would not result in an error exit, and
would therefore result in broken sources being present.

In practise, I always very closely watch the terminal when
testing xbmk, especially when updating project patches, so
we probably didn't introduce any broken sources in practice.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/get.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/get.sh b/include/get.sh
index 6f1b5f1d..3d06eb4a 100644
--- a/include/get.sh
+++ b/include/get.sh
@@ -111,7 +111,8 @@ try_file()
 	eval "[ -$echk \"$cached\" ] || return 1"
 
 	if [ "$2" = "git" ]; then
-		[ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || return 1
+		[ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || \
+		    err "Can't clone final repo in command: try_file $*"; :
 	else
 		bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1
 		[ "$cached" != "$5" ] && x_ cp "$cached" "$5"
-- 
cgit v1.2.1


From 30bc3732c39cbb14faa8f7caf0c9206f6a401008 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 25 May 2025 17:01:10 +0100
Subject: init.sh: error out if .git/ is a symlink

the current behaviour is a relic from the older lbmk
design, before recent auditing.

the current logic would cause xbmk to continue execution,
going into a child process with .git/ being a symlink.

The .git/ directory should never be a symlink, because
it is extremely error-prone.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/init.sh b/include/init.sh
index 38eb1c81..9265bf45 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -195,7 +195,7 @@ xbmk_git_init()
 		    || err "Run this first: $gitcmd \"your ${gitcmd##*.}\""
 	done
 
-	[ -L ".git" ] && return 1
+	[ -L ".git" ] && err "'$xbmkpwd/.git' is a symlink"
 	[ -e ".git" ] && return 0
 	eval "`setvars "$(date -Rud @$versiondate)" cdate _nogit`"
 
-- 
cgit v1.2.1