coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 03:25:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

rom.sh: simplify u-boot payload handling

Browse Source 
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>
This commit is contained in:
Leah Rowe
2025-05-25 03:09:29 +01:00
parent 3e28873532
commit 8c3f10ba40
91 changed files with 107 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/coreboot/dell3050micro_vfsp_16mb/target.cfg
+1 -1
View File
@@ -10,4 +10,4 @@ grubtree="xhci"
vcfg="3050micro" vcfg="3050micro"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
IFD_platform="sklkbl" IFD_platform="sklkbl"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell7010sff_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
vcfg="t1650" vcfg="t1650"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell780mt_8mb/target.cfg
+1 -1
View File
@@ -8,4 +8,4 @@ payload_memtest="y"
grub_scan_disk="nvme ahci ata" grub_scan_disk="nvme ahci ata"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell780mt_truncate_8mb/target.cfg
+1 -1
View File
@@ -8,4 +8,4 @@ payload_memtest="y"
grub_scan_disk="nvme ahci ata" grub_scan_disk="nvme ahci ata"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell780usff_8mb/target.cfg
+1 -1
View File
@@ -8,4 +8,4 @@ payload_memtest="y"
grub_scan_disk="nvme ahci ata" grub_scan_disk="nvme ahci ata"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell780usff_truncate_8mb/target.cfg
+1 -1
View File
@@ -8,4 +8,4 @@ payload_memtest="y"
grub_scan_disk="nvme ahci ata" grub_scan_disk="nvme ahci ata"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell9020mt_nri_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="haswell" vcfg="haswell"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/dell9020sff_nri_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="haswell" vcfg="haswell"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e4300_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e5420_6mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e5520_6mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e5530_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6220_10mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6230_12mb/target.cfg
+2 -2
View File
@@ -7,5 +7,5 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6320_10mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6330_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6400_4mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="e6400" vcfg="e6400"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6420_10mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6430_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6520_10mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/e6530_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/g43t_am3/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_memtest="y" payload_memtest="y"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/g43t_am3_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_memtest="y"
release="n" release="n"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/gru_bob/target.cfg
+1 -1
View File
@@ -2,5 +2,5 @@
tree="default" tree="default"
xarch="aarch64-elf arm-eabi" xarch="aarch64-elf arm-eabi"
payload_uboot="y" payload_uboot="arm64"
build_depend="u-boot/gru_bob" build_depend="u-boot/gru_bob"
config/coreboot/gru_kevin/target.cfg
+1 -1
View File
@@ -2,5 +2,5 @@
tree="default" tree="default"
xarch="aarch64-elf arm-eabi" xarch="aarch64-elf arm-eabi"
payload_uboot="y" payload_uboot="arm64"
build_depend="u-boot/gru_kevin" build_depend="u-boot/gru_kevin"
config/coreboot/hp2170p_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="hp2170p" vcfg="hp2170p"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp2560p_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="hp2560p" vcfg="hp2560p"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp2570p_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="hp2570p" vcfg="hp2570p"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp8200sff_4mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
vcfg="hp8200sff" vcfg="hp8200sff"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp8200sff_8mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
vcfg="hp8200sff" vcfg="hp8200sff"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp820g2_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="hp820g2" vcfg="hp820g2"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp8300cmt_16mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
vcfg="ivybridge" vcfg="ivybridge"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp8300usdt_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp8460pintel_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="hp8460pintel" vcfg="hp8460pintel"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp8470pintel_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="hp8470pintel" vcfg="hp8470pintel"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/hp9470m_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="hp9470m" vcfg="hp9470m"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/kcma_d8_16mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ xlang="c"
grub_scan_disk="nvme ahci" grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/kcma_d8_2mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ xlang="c"
grub_scan_disk="nvme ahci" grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/kfsn4_dre_1mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_memtest="y" payload_memtest="y"
xlang="c" xlang="c"
build_depend="seabios/default memtest86plus u-boot/amd64coreboot" build_depend="seabios/default memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/kfsn4_dre_2mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
xlang="c" xlang="c"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/kgpe_d16_16mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ xlang="c"
grub_scan_disk="nvme ahci" grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/kgpe_d16_2mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ xlang="c"
grub_scan_disk="nvme ahci" grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/macbook11/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
build_depend="seabios/default grub/default u-boot/i386coreboot" build_depend="seabios/default grub/default u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/coreboot/macbook11_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
scan_scan_disk="ahci" scan_scan_disk="ahci"
build_depend="seabios/default grub/default u-boot/i386coreboot" build_depend="seabios/default grub/default u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/coreboot/macbook21/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/macbook21_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/q45t_am/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_memtest="y" payload_memtest="y"
grubtree="nvme" grubtree="nvme"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/qemu_arm64_12mb/target.cfg
+1 -1
View File
@@ -2,5 +2,5 @@
tree="default" tree="default"
xarch="aarch64-elf arm-eabi" xarch="aarch64-elf arm-eabi"
payload_uboot="y" payload_uboot="arm64"
build_depend="u-boot/qemu_arm64_12mb" build_depend="u-boot/qemu_arm64_12mb"
config/coreboot/qemu_x86_12mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_grub="y"
payload_seabios="y" payload_seabios="y"
payload_memtest="y" payload_memtest="y"
build_depend="seabios/default grub/default memtest86plus u-boot/i386coreboot" build_depend="seabios/default grub/default memtest86plus u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/coreboot/qemu_x86_64_12mb/target.cfg
+1 -1
View File
@@ -5,4 +5,4 @@ xarch="i386-elf"
payload_grub="y" payload_grub="y"
payload_seabios="y" payload_seabios="y"
payload_memtest="y" payload_memtest="y"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/r400_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/r400_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/r400_8mb/target.cfg
+1 -1
View File
@@ -5,4 +5,4 @@ xarch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/r500_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t1650_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="nvme" grubtree="nvme"
vcfg="t1650" vcfg="t1650"
build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t1700mt_bmrc_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="t1700" vcfg="t1700"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t1700sff_bmrc_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="t1700" vcfg="t1700"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t400_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t400_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t400_8mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t420_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t420s_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t430_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t440plibremrc_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="haswell" vcfg="haswell"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t500_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t500_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t500_8mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t520_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t530_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/t60_16mb_intelgpu/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
build_depend="seabios/default grub/default u-boot/i386coreboot" build_depend="seabios/default grub/default u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/coreboot/t60_intelgpu/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
build_depend="seabios/default grub/default u-boot/i386coreboot" build_depend="seabios/default grub/default u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/coreboot/w500_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/w500_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/w500_8mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/w530_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/w541_12mb/target.cfg
+1 -1
View File
@@ -9,4 +9,4 @@ grub_scan_disk="nvme ahci"
grubtree="xhci" grubtree="xhci"
vcfg="haswell" vcfg="haswell"
build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x200_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x200_4mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x200_8mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x220_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="sandybridge" vcfg="sandybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x230_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x230_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x230t_12mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x230t_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
vcfg="ivybridge" vcfg="ivybridge"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x301_16mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
release="n" release="n"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x301_4mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
release="n" release="n"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x301_8mb/target.cfg
+1 -1
View File
@@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y" payload_memtest="y"
release="n" release="n"
grub_scan_disk="ahci" grub_scan_disk="ahci"
payload_uboot_amd64="y" payload_uboot="amd64"
config/coreboot/x60/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
build_depend="seabios/default grub/default u-boot/i386coreboot" build_depend="seabios/default grub/default u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/coreboot/x60_16mb/target.cfg
+1 -1
View File
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y" payload_grub="y"
grub_scan_disk="ahci" grub_scan_disk="ahci"
build_depend="seabios/default grub/default u-boot/i386coreboot" build_depend="seabios/default grub/default u-boot/i386coreboot"
payload_uboot_i386="y" payload_uboot="i386"
config/data/coreboot/mkhelper.cfg
+2 -3
View File
@@ -5,10 +5,9 @@ build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
pv="payload_uboot payload_seabios payload_memtest payload_grub" pv="payload_seabios payload_memtest payload_grub payload_grubsea"
pv="$pv payload_uboot_i386 payload_uboot_amd64 payload_grubsea"
v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname" 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 "n" $pv`
eval `setvars "" $v` eval `setvars "" $v`
include/rom.sh
+15 -22
View File
@@ -94,21 +94,16 @@ mkcorebootbin()
initmode="${initmode%%_*}" initmode="${initmode%%_*}"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/cbfstool/$tree/cbfstool"
[ "$payload_uboot_i386" = "y" ] && \ [ -z "$payload_uboot" ] || [ "$payload_uboot" = "amd64" ] || \
[ "$payload_uboot_amd64" = "y" ] && \ [ "$payload_uboot" = "i386" ] || [ "$payload_uboot" = "arm64" ] \
err "'$target' enables 32- and 64-bit x86 U-Boot" || err "'$target' defines bad u-boot type '$payload_uboot'"
if [ "$payload_uboot_i386" = "y" ] || \ [ -z "$payload_uboot" ] || [ "$payload_uboot" = "arm64" ] || \
[ "$payload_uboot_amd64" = "y" ]; then
printf "'%s' has x86 U-Boot; assuming SeaBIOS=y\n" \
"$target" 1>&2
payload_seabios="y" payload_seabios="y"
fi
[ -n "$uboot_config" ] || uboot_config="default" [ -n "$uboot_config" ] || uboot_config="default"
[ "$payload_uboot" = "y" ] || payload_seabios="y"
[ "$payload_grub" = "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." $dry err "$target: U-Boot(arm64) and SeaBIOS/GRUB both enabled."
[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata"
@@ -126,7 +121,8 @@ mkcorebootbin()
if $dry grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then if $dry grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then
[ "$payload_seabios" = "y" ] && pname="seabios" && \ [ "$payload_seabios" = "y" ] && pname="seabios" && \
$dry add_seabios $dry add_seabios
[ "$payload_uboot" = "y" ] && pname="uboot" && $dry add_uboot [ "$payload_uboot" = "arm64" ] && pname="uboot" && \
$dry add_uboot; :
else else
pname="custom" pname="custom"
$dry cprom $dry cprom
@@ -135,10 +131,8 @@ mkcorebootbin()
add_seabios() add_seabios()
{ {
if [ "$payload_uboot_i386" = "y" ] || \ [ -z "$payload_uboot" ] || [ "$payload_uboot" = "arm64" ] || \
[ "$payload_uboot_amd64" = "y" ]; then $dry add_uboot
$dry add_uboot
fi
_seabioself="elf/seabios/default/$initmode/bios.bin.elf" _seabioself="elf/seabios/default/$initmode/bios.bin.elf"
_seaname="fallback/payload" && [ "$payload_grubsea" = "y" ] && \ _seaname="fallback/payload" && [ "$payload_grubsea" = "y" ] && \
@@ -159,7 +153,7 @@ add_seabios()
[ "$payload_grub" = "y" ] && add_grub [ "$payload_grub" = "y" ] && add_grub
[ "$payload_grubsea" != "y" ] && cprom [ "$payload_grubsea" != "y" ] && cprom
[ "$payload_uboot_amd64" = "y" ] && [ "$displaymode" != "txtmode" ] && \ [ "$payload_uboot" = "amd64" ] && [ "$displaymode" != "txtmode" ] && \
[ "$initmode" != "normal" ] && [ "$payload_grubsea" != "y" ] && \ [ "$initmode" != "normal" ] && [ "$payload_grubsea" != "y" ] && \
pname="seauboot" && cprom "seauboot" pname="seauboot" && cprom "seauboot"
[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; : [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
@@ -206,14 +200,13 @@ add_uboot()
ubpath="fallback/payload" ubpath="fallback/payload"
ubtarget="$target" ubtarget="$target"
# override for x86/x86_64 targets: # override for x86/x86_64 targets:
if [ "$payload_uboot_i386" = "y" ] || \ if [ -n "$payload_uboot" ] && [ "$payload_uboot" != "arm64" ]; then
[ "$payload_uboot_amd64" = "y" ]; then
ubcbfsargs="-l 0x1110000 -e 0x1110000" # 64-bit and 32-bit ubcbfsargs="-l 0x1110000 -e 0x1110000" # 64-bit and 32-bit
# on 64-bit, 0x1120000 is the SPL, and stub before that # on 64-bit, 0x1120000 is the SPL, and stub before that
ubpath="img/u-boot" # 64-bit ubpath="img/u-boot" # 64-bit
ubtarget="amd64coreboot" ubtarget="amd64coreboot"
[ "$payload_uboot_i386" = "y" ] && ubpath="u-boot" # 32-bit [ "$payload_uboot" = "i386" ] && ubpath="u-boot" # 32-bit
[ "$payload_uboot_i386" = "y" ] && ubtarget="i386coreboot"; : [ "$payload_uboot" = "i386" ] && ubtarget="i386coreboot"; :
fi fi
ubdir="elf/u-boot/$ubtarget/$uboot_config" ubdir="elf/u-boot/$ubtarget/$uboot_config"
@@ -222,8 +215,8 @@ add_uboot()
ubootelf="$ubdir/u-boot.elf" && [ ! -f "$ubootelf" ] && \ ubootelf="$ubdir/u-boot.elf" && [ ! -f "$ubootelf" ] && \
ubootelf="$ubdir/u-boot" ubootelf="$ubdir/u-boot"
# override for x86/x86_64 targets: # override for x86/x86_64 targets:
[ "$payload_uboot_i386" = "y" ] && ubootelf="$ubdir/u-boot-dtb.bin" [ "$payload_uboot" = "i386" ] && ubootelf="$ubdir/u-boot-dtb.bin"
[ "$payload_uboot_amd64" = "y" ] && \ [ "$payload_uboot" = "amd64" ] && \
ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible
cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs