canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 25.06_branch

25.06_branch
Leah Rowe 2025-05-25 20:57:27 +01:00
parent 0b9c7fed6d 7b8185f460
commit 8a8a3f1816
81 changed files with 103 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/coreboot/dell7010sff_12mb/target.cfg
View File

@ -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"

2
config/coreboot/dell780mt_8mb/target.cfg
View File

@ -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"

2
config/coreboot/dell780mt_truncate_8mb/target.cfg
View File

@ -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"

2
config/coreboot/dell780usff_8mb/target.cfg
View File

@ -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"

2
config/coreboot/dell780usff_truncate_8mb/target.cfg
View File

@ -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"

2
config/coreboot/dell9020mt_nri_12mb/target.cfg
View File

@ -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"

2
config/coreboot/dell9020sff_nri_12mb/target.cfg
View File

@ -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"

2
config/coreboot/e4300_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e5420_6mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e5520_6mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e5530_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6220_10mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

4
config/coreboot/e6230_12mb/target.cfg
View File

@ -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"

2
config/coreboot/e6320_10mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6330_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6400_4mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="e6400"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6420_10mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6430_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6520_10mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/e6530_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/g43t_am3/target.cfg
View File

@ -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"

2
config/coreboot/g43t_am3_16mb/target.cfg
View File

@ -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"

2
config/coreboot/gru_bob/target.cfg
View File

@ -2,5 +2,5 @@
tree="default"
xarch="aarch64-elf arm-eabi"
payload_uboot="y"
payload_uboot="arm64"
build_depend="u-boot/gru_bob"

2
config/coreboot/gru_kevin/target.cfg
View File

@ -2,5 +2,5 @@
tree="default"
xarch="aarch64-elf arm-eabi"
payload_uboot="y"
payload_uboot="arm64"
build_depend="u-boot/gru_kevin"

2
config/coreboot/hp8200sff_8mb/target.cfg
View File

@ -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"

2
config/coreboot/hp8300cmt_16mb/target.cfg
View File

@ -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"

2
config/coreboot/hp8300usdt_16mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/kcma_d8_16mb/target.cfg
View File

@ -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"

2
config/coreboot/kcma_d8_2mb/target.cfg
View File

@ -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"

2
config/coreboot/kfsn4_dre_1mb/target.cfg
View File

@ -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"

2
config/coreboot/kfsn4_dre_2mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
xlang="c"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/kgpe_d16_16mb/target.cfg
View File

@ -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"

2
config/coreboot/kgpe_d16_2mb/target.cfg
View File

@ -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"

2
config/coreboot/macbook11/target.cfg
View File

@ -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"

2
config/coreboot/macbook11_16mb/target.cfg
View File

@ -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"

2
config/coreboot/macbook21/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/macbook21_16mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/q45t_am/target.cfg
View File

@ -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"

2
config/coreboot/qemu_arm64_12mb/target.cfg
View File

@ -2,5 +2,5 @@
tree="default"
xarch="aarch64-elf arm-eabi"
payload_uboot="y"
payload_uboot="arm64"
build_depend="u-boot/qemu_arm64_12mb"

2
config/coreboot/qemu_x86_12mb/target.cfg
View File

@ -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"

2
config/coreboot/qemu_x86_64_12mb/target.cfg
View File

@ -5,4 +5,4 @@ xarch="i386-elf"
payload_grub="y"
payload_seabios="y"
payload_memtest="y"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/r400_16mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/r400_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/r400_8mb/target.cfg
View File

@ -5,4 +5,4 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
payload_memtest="y"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/r500_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t1650_12mb/target.cfg
View File

@ -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"

2
config/coreboot/t400_16mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t400_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t400_8mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t420_8mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t420s_8mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t430_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t440plibremrc_12mb/target.cfg
View File

@ -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"

2
config/coreboot/t500_16mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t500_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t500_8mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t520_8mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t530_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/t60_16mb_intelgpu/target.cfg
View File

@ -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"

2
config/coreboot/t60_intelgpu/target.cfg
View File

@ -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"

2
config/coreboot/w500_16mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/w500_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/w500_8mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/w530_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/w541_12mb/target.cfg
View File

@ -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"

2
config/coreboot/x200_16mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x200_4mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x200_8mb/target.cfg
View File

@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x220_8mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x230_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x230t_12mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x301_16mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
release="n"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x301_4mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
release="n"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x301_8mb/target.cfg
View File

@ -7,4 +7,4 @@ payload_grub="y"
payload_memtest="y"
release="n"
grub_scan_disk="ahci"
payload_uboot_amd64="y"
payload_uboot="amd64"

2
config/coreboot/x60/target.cfg
View File

@ -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"

2
config/coreboot/x60_16mb/target.cfg
View File

@ -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"

7
config/data/coreboot/mkhelper.cfg
View File

@ -5,13 +5,12 @@ build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
pv="payload_uboot payload_seabios payload_memtest payload_grub"
pv="$pv payload_uboot_i386 payload_uboot_amd64 payload_grubsea"
pv="payload_seabios payload_memtest payload_grub payload_grubsea"
v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname"
v="$v displaymode tmprom newrom"
v="$v displaymode tmprom newrom payload_uboot"
eval `setvars "n" $pv`
eval `setvars "" $v`
premake="mkvendorfiles"
premake="corebootpremake"
mkhelper="mkcorebootbin"
postmake="mkcoreboottar"

3
include/get.sh
View File

@ -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"

2
include/init.sh
View File

@ -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`"

56
include/rom.sh
View File

@ -43,22 +43,15 @@ mkpayload_grub()
"/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; :
}
mkvendorfiles()
corebootpremake()
{
[ -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"; :
}
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"
@ -92,21 +85,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"
@ -124,7 +112,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
@ -133,10 +122,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" ] && \
@ -157,7 +144,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; :
@ -204,14 +191,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"
@ -220,8 +206,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
@ -265,8 +251,6 @@ cbfs()
mkcoreboottar()
{
[ "$target" = "$tree" ] && return 0
[ "$XBMK_RELEASE" = "y" ] || return 0
[ "$release" != "n" ] || return 0
$dry mkrom_tarball "bin/$target"; :
[ "$target" != "$tree" ] && [ "$XBMK_RELEASE" = "y" ] && \
[ "$release" != "n" ] && $dry mkrom_tarball "bin/$target"; :
}

2
include/tree.sh
View File

@ -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!"