libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

update/trees: simplified crossgcc handling 

only call crossgcc for coreboot and u-boot, but use
hostcc for everything else. simplify the checking of
which architecture to compile for. "arch" in target.cfg
files has been modified, to allow further simplification.

without this patch, the logic currently only *barely* avoids
using crossgcc on things like utils, and only works in practise
because, in practise, lbmk only works on x86_64 anyway.

the new logic, as per this patch, is simpler and more robust.

Signed-off-by: Leah Rowe <leah@libreboot.org>
9020vga
Leah Rowe 2023-12-21 10:48:07 +00:00
parent 4711098e94
commit 90ac30b163
91 changed files with 102 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_32" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_32" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,4 +1,4 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
arch="x86_64" arch="i386-elf"

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

@ -1,4 +1,4 @@
tree="dell" tree="dell"
romtype="normal" romtype="normal"
rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
arch="x86_64" arch="i386-elf"

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

@ -1,6 +1,6 @@
tree="dell" tree="dell"
romtype="4MiB ICH9 IFD NOR flash" romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,7 +1,7 @@
tree="fam15h_rdimm" tree="fam15h_rdimm"
romtype="normal" romtype="normal"
rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="n" payload_seabios="n"

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

@ -1,7 +1,7 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="normal" romtype="normal"
rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="n" payload_seabios="n"

2
config/coreboot/g43t-am3/target.cfg
View File

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_memtest="y" payload_memtest="y"
microcode_required="n" microcode_required="n"

2
config/coreboot/g43t-am3_16mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_memtest="y" payload_memtest="y"
microcode_required="n" microcode_required="n"

2
config/coreboot/ga-g41m-es2l/target.cfg
View File

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_memtest="y" payload_memtest="y"
grub_scan_disk="ata" grub_scan_disk="ata"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="AArch64" arch="aarch64-elf"
payload_uboot="y" payload_uboot="y"
vendorfiles="n" vendorfiles="n"
microcode_required="n" microcode_required="n"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="AArch64" arch="aarch64-elf"
payload_uboot="y" payload_uboot="y"
vendorfiles="n" vendorfiles="n"
microcode_required="n" microcode_required="n"

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

@ -1,4 +1,4 @@
tree="haswell" tree="haswell"
romtype="normal" romtype="normal"
rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b" rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b"
arch="x86_64" arch="i386-elf"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

2
config/coreboot/kcma-d8-rdimm_16mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_rdimm" tree="fam15h_rdimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

2
config/coreboot/kcma-d8-rdimm_2mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_rdimm" tree="fam15h_rdimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

2
config/coreboot/kcma-d8-udimm_16mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

2
config/coreboot/kcma-d8-udimm_2mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

2
config/coreboot/kfsn4-dre_1mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_memtest="y" payload_memtest="y"
crossgcc_ada="n" crossgcc_ada="n"

2
config/coreboot/kfsn4-dre_2mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

2
config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_rdimm" tree="fam15h_rdimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

2
config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_rdimm" tree="fam15h_rdimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

2
config/coreboot/kgpe-d16-udimm_16mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

2
config/coreboot/kgpe-d16-udimm_2mb/target.cfg
View File

@ -1,6 +1,6 @@
tree="fam15h_udimm" tree="fam15h_udimm"
romtype="d8d16sas" romtype="d8d16sas"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_memtest="y" payload_memtest="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_32" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_32" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="AArch64" arch="aarch64-elf"
payload_uboot="y" payload_uboot="y"
vendorfiles="n" vendorfiles="n"
microcode_required="n" microcode_required="n"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_seabios="y" payload_seabios="y"
payload_seabios_withgrub="y" payload_seabios_withgrub="y"
payload_seabios_grubonly="y" payload_seabios_grubonly="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="haswell" tree="haswell"
romtype="t440p" romtype="t440p"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="t440p" romtype="t440p"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_32" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_32" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="haswell" tree="haswell"
romtype="t440p" romtype="t440p"
arch="x86_64" arch="i386-elf"
payload_grub="n" payload_grub="n"
payload_grub_withseabios="n" payload_grub_withseabios="n"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="t440p" romtype="t440p"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="normal" romtype="normal"
arch="x86_64" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_32" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

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

@ -1,6 +1,6 @@
tree="default" tree="default"
romtype="i945 laptop" romtype="i945 laptop"
arch="x86_32" arch="i386-elf"
payload_grub="y" payload_grub="y"
payload_grub_withseabios="y" payload_grub_withseabios="y"
payload_seabios="y" payload_seabios="y"

2
config/seabios/default/target.cfg
View File

@ -1,3 +1,3 @@
arch="x86_32" arch="i386-elf"
tree="default" tree="default"
rev="1e1da7a963007d03a4e0e9a9e0ff17990bb1608d" rev="1e1da7a963007d03a4e0e9a9e0ff17990bb1608d"

2
config/u-boot/default/target.cfg
View File

@ -1,3 +1,3 @@
tree="default" tree="default"
rev="4459ed60cb1e0562bc5b40405e2b4b9bbf766d57" # v2023.10 rev="4459ed60cb1e0562bc5b40405e2b4b9bbf766d57" # v2023.10
arch="AArch64" arch="aarch64-elf"

2
config/u-boot/gru_bob/target.cfg
View File

@ -1,2 +1,2 @@
tree="default" tree="default"
arch="AArch64" arch="aarch64-elf"

2
config/u-boot/gru_kevin/target.cfg
View File

@ -1,2 +1,2 @@
tree="default" tree="default"
arch="AArch64" arch="aarch64-elf"

2
config/u-boot/qemu_arm64_12mb/target.cfg
View File

@ -1,2 +1,2 @@
tree="default" tree="default"
arch="AArch64" arch="aarch64-elf"

2
config/u-boot/qemu_x86_12mb/target.cfg
View File

@ -1,2 +1,2 @@
tree="default" tree="default"
arch="x86_64" arch="i386-elf"

41
script/update/trees
View File

@ -174,45 +174,28 @@ handle_src_tree()
# (seabios and grub currently use hostcc, not crossgcc) # (seabios and grub currently use hostcc, not crossgcc)
check_cross_compiler() check_cross_compiler()
{ {
[ "$project" = "u-boot" ] || [ "$project" = "coreboot" ] || return 0
[ -z "${arch}" ] && return 0
_arch="${arch}"
[ "${arch}" = "aarch64-elf" ] && _arch="aarch64-elf arm-eabi"
[ "${crossgcc_ada}" = "y" ] || [ "${crossgcc_ada}" = "n" ] || \ [ "${crossgcc_ada}" = "y" ] || [ "${crossgcc_ada}" = "n" ] || \
crossgcc_ada="y" crossgcc_ada="y"
[ "${crossgcc_ada}" = "y" ] || export BUILD_LANGUAGES=c [ "${crossgcc_ada}" = "y" ] || export BUILD_LANGUAGES=c
cbdir="src/coreboot/${tree}" cbdir="src/coreboot/${tree}"
[ "${project}" != "coreboot" ] && cbdir="src/coreboot/default" [ "${project}" != "coreboot" ] && cbdir="src/coreboot/default"
x_ ./update trees -f coreboot ${cbdir#src/coreboot/}
# only true if not building coreboot: for xarch in ${_arch}; do
ctarget="${cbdir#src/coreboot/}" [ -d "${cbdir}/util/crossgcc/xgcc/${xarch}/" ] && continue
[ -d "${cbdir}" ] || x_ ./update trees -f coreboot ${ctarget} x_ make -C "${cbdir}" crossgcc-${xarch%-*} CPUS=$(nproc)
done
if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
[ -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ] || \
x_ make -C "${cbdir}" crossgcc-i386 CPUS=$(nproc)
case "$(uname -m)" in
x86*|i*86|amd64) : ;;
*) export CROSS_COMPILE=i386-elf- ;;
esac
elif [ "${arch}" = "ARMv7" ]; then
[ -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ] || \
x_ make -C "${cbdir}" crossgcc-arm CPUS=$(nproc)
case "$(uname -m)" in
arm|arm32|armv6*|armv7*) : ;;
*) export CROSS_COMPILE=arm-eabi- ;;
esac
elif [ "${arch}" = "AArch64" ]; then
[ -d "${cbdir}/util/crossgcc/xgcc/aarch64-elf/" ] || \
x_ make -C "${cbdir}" crossgcc-aarch64 CPUS=$(nproc)
# aarch64 also needs armv7 toolchain for arm-trusted-firmware
[ -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ] || \
x_ make -C "${cbdir}" crossgcc-arm CPUS=$(nproc)
case "$(uname -m)" in
arm64|aarch64) : ;;
*) export CROSS_COMPILE=aarch64-elf- ;;
esac
fi
# we *must* ensure that u-boot's build system uses crossgcc first # we *must* ensure that u-boot's build system uses crossgcc first
export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH" export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH"
export CROSS_COMPILE="${_arch% *}-"
} }
check_config() check_config()