diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-12-27 15:18:21 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-12-27 16:07:32 +0000 |
| commit | eff9130b7ab9ce79338ae6b1ec5c2f18bad5b5ec (patch) | |
| tree | cbbb0178e265bac6864a5bbaaa10fd52f4606d5f | |
| parent | 6752780f46e3747ead538a7a5b62f63fe86ab505 (diff) | |
update/trees: further simplify crossgcc handling
arch no longer needs to be set, on multi-tree projects,
and it has been renamed to xarch
the new behaviour is: if xarch is set, treat it as a
list of crossgcc targets and go through the list. set
the first one as the target, for what lbmk builds, but
build all of the defined crossgccc targets
crossgcc_ada is now xlang, and defines which languages
to build, rather than whether to build gcc-gnat
Signed-off-by: Leah Rowe <leah@libreboot.org>
94 files changed, 115 insertions, 128 deletions
diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg index 251cae5b..69c1db41 100644 --- a/config/coreboot/d510mo/target.cfg +++ b/config/coreboot/d510mo/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/d510mo_16mb/target.cfg b/config/coreboot/d510mo_16mb/target.cfg index 3958f90b..1e7b56ca 100644 --- a/config/coreboot/d510mo_16mb/target.cfg +++ b/config/coreboot/d510mo_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" diff --git a/config/coreboot/d945gclf_512kb/target.cfg b/config/coreboot/d945gclf_512kb/target.cfg index 4c1ed0b6..cfae0b2c 100644 --- a/config/coreboot/d945gclf_512kb/target.cfg +++ b/config/coreboot/d945gclf_512kb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/d945gclf_8mb/target.cfg b/config/coreboot/d945gclf_8mb/target.cfg index 4c1ed0b6..cfae0b2c 100644 --- a/config/coreboot/d945gclf_8mb/target.cfg +++ b/config/coreboot/d945gclf_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/default/target.cfg b/config/coreboot/default/target.cfg index 19672664..231397bd 100644 --- a/config/coreboot/default/target.cfg +++ b/config/coreboot/default/target.cfg @@ -1,3 +1,3 @@ tree="default" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" -arch="i386-elf" +xarch="i386-elf" diff --git a/config/coreboot/dell/target.cfg b/config/coreboot/dell/target.cfg index eecaecfd..d8ec61d6 100644 --- a/config/coreboot/dell/target.cfg +++ b/config/coreboot/dell/target.cfg @@ -1,3 +1,3 @@ tree="dell" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" -arch="i386-elf" +xarch="i386-elf" diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg index 46a3425e..3a458ee4 100644 --- a/config/coreboot/e6400_4mb/target.cfg +++ b/config/coreboot/e6400_4mb/target.cfg @@ -1,5 +1,5 @@ tree="dell" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/e6400nvidia_4mb/target.cfg b/config/coreboot/e6400nvidia_4mb/target.cfg index 46a3425e..3a458ee4 100644 --- a/config/coreboot/e6400nvidia_4mb/target.cfg +++ b/config/coreboot/e6400nvidia_4mb/target.cfg @@ -1,5 +1,5 @@ tree="dell" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/coreboot/e6430_12mb/target.cfg index ddcf32d4..03fd230b 100644 --- a/config/coreboot/e6430_12mb/target.cfg +++ b/config/coreboot/e6430_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/coreboot/e6530_12mb/target.cfg index ddcf32d4..03fd230b 100644 --- a/config/coreboot/e6530_12mb/target.cfg +++ b/config/coreboot/e6530_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/fam15h_rdimm/target.cfg b/config/coreboot/fam15h_rdimm/target.cfg index 60827616..7d60e76a 100644 --- a/config/coreboot/fam15h_rdimm/target.cfg +++ b/config/coreboot/fam15h_rdimm/target.cfg @@ -1,8 +1,8 @@ tree="fam15h_rdimm" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="n" payload_memtest="n" -crossgcc_ada="n" +xlang="c" diff --git a/config/coreboot/fam15h_udimm/target.cfg b/config/coreboot/fam15h_udimm/target.cfg index 80565e90..6b2d493d 100644 --- a/config/coreboot/fam15h_udimm/target.cfg +++ b/config/coreboot/fam15h_udimm/target.cfg @@ -1,8 +1,8 @@ tree="fam15h_udimm" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="n" payload_memtest="n" -crossgcc_ada="n" +xlang="c" diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg index db5a46d9..13f2a260 100644 --- a/config/coreboot/g43t-am3/target.cfg +++ b/config/coreboot/g43t-am3/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_timeout=10 diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg index db5a46d9..13f2a260 100644 --- a/config/coreboot/g43t-am3_16mb/target.cfg +++ b/config/coreboot/g43t-am3_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_timeout=10 diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg index 755d23a9..ef85da4b 100644 --- a/config/coreboot/ga-g41m-es2l/target.cfg +++ b/config/coreboot/ga-g41m-es2l/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_scan_disk="ata" diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg index 10c4285c..a7c36159 100644 --- a/config/coreboot/gru_bob/target.cfg +++ b/config/coreboot/gru_bob/target.cfg @@ -1,3 +1,3 @@ tree="default" -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" payload_uboot="y" diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg index 10c4285c..a7c36159 100644 --- a/config/coreboot/gru_kevin/target.cfg +++ b/config/coreboot/gru_kevin/target.cfg @@ -1,3 +1,3 @@ tree="default" -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" payload_uboot="y" diff --git a/config/coreboot/haswell/target.cfg b/config/coreboot/haswell/target.cfg index 08d2c6e2..b3196341 100644 --- a/config/coreboot/haswell/target.cfg +++ b/config/coreboot/haswell/target.cfg @@ -1,3 +1,3 @@ tree="haswell" rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b" -arch="i386-elf" +xarch="i386-elf" diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg index fdbb4f51..fee132f4 100644 --- a/config/coreboot/hp2170p_16mb/target.cfg +++ b/config/coreboot/hp2170p_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg index fdbb4f51..fee132f4 100644 --- a/config/coreboot/hp2560p_8mb/target.cfg +++ b/config/coreboot/hp2560p_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg index fdbb4f51..fee132f4 100644 --- a/config/coreboot/hp2570p_16mb/target.cfg +++ b/config/coreboot/hp2570p_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index 6433b508..0badb4fb 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index 6433b508..0badb4fb 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg index 6433b508..0badb4fb 100644 --- a/config/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/coreboot/hp8300cmt_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg index 6433b508..0badb4fb 100644 --- a/config/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/coreboot/hp8300usdt_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg index fdbb4f51..fee132f4 100644 --- a/config/coreboot/hp8460pintel_8mb/target.cfg +++ b/config/coreboot/hp8460pintel_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg index fdbb4f51..fee132f4 100644 --- a/config/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/coreboot/hp8470pintel_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg index fdbb4f51..fee132f4 100644 --- a/config/coreboot/hp9470m_16mb/target.cfg +++ b/config/coreboot/hp9470m_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg index 1a177eaf..d5d37291 100644 --- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_rdimm" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg index 1a177eaf..d5d37291 100644 --- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_rdimm" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg index 869798fa..a8a4a5fc 100644 --- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_udimm" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg index 869798fa..a8a4a5fc 100644 --- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_udimm" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg index 375b5894..19c57b8d 100644 --- a/config/coreboot/kfsn4-dre_1mb/target.cfg +++ b/config/coreboot/kfsn4-dre_1mb/target.cfg @@ -1,6 +1,6 @@ tree="fam15h_udimm" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" grub_timeout=10 diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg index f972c863..9bd20d45 100644 --- a/config/coreboot/kfsn4-dre_2mb/target.cfg +++ b/config/coreboot/kfsn4-dre_2mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_udimm" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg index f444f22e..2867a730 100644 --- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_rdimm" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg index f444f22e..2867a730 100644 --- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_rdimm" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg index f972c863..9bd20d45 100644 --- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_udimm" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg index f972c863..9bd20d45 100644 --- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg @@ -1,7 +1,7 @@ tree="fam15h_udimm" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" -crossgcc_ada="n" +xlang="c" grub_timeout=10 diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index 78bb05d0..cc83f2c3 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg index 78bb05d0..cc83f2c3 100644 --- a/config/coreboot/macbook11_16mb/target.cfg +++ b/config/coreboot/macbook11_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/macbook21/target.cfg +++ b/config/coreboot/macbook21/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/macbook21_16mb/target.cfg +++ b/config/coreboot/macbook21_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/coreboot/qemu_arm64_12mb/target.cfg index 10c4285c..a7c36159 100644 --- a/config/coreboot/qemu_arm64_12mb/target.cfg +++ b/config/coreboot/qemu_arm64_12mb/target.cfg @@ -1,3 +1,3 @@ tree="default" -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" payload_uboot="y" diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg index ceda8dd3..fc263ecc 100644 --- a/config/coreboot/qemu_x86_12mb/target.cfg +++ b/config/coreboot/qemu_x86_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/r400_16mb/target.cfg +++ b/config/coreboot/r400_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/r400_4mb/target.cfg +++ b/config/coreboot/r400_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/r400_8mb/target.cfg +++ b/config/coreboot/r400_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/r500_4mb/target.cfg +++ b/config/coreboot/r500_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg index e889d1ee..e6d3bec6 100644 --- a/config/coreboot/t1650_12mb/target.cfg +++ b/config/coreboot/t1650_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_seabios_grubonly="y" diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t400_16mb/target.cfg +++ b/config/coreboot/t400_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t400_4mb/target.cfg +++ b/config/coreboot/t400_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t400_8mb/target.cfg +++ b/config/coreboot/t400_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t420_8mb/target.cfg b/config/coreboot/t420_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t420_8mb/target.cfg +++ b/config/coreboot/t420_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/coreboot/t420s_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t420s_8mb/target.cfg +++ b/config/coreboot/t420s_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t430_12mb/target.cfg b/config/coreboot/t430_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t430_12mb/target.cfg +++ b/config/coreboot/t430_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg index 33790c67..d36486ab 100644 --- a/config/coreboot/t440plibremrc_12mb/target.cfg +++ b/config/coreboot/t440plibremrc_12mb/target.cfg @@ -1,5 +1,5 @@ tree="haswell" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/t440pmrc_12mb/target.cfg b/config/coreboot/t440pmrc_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t440pmrc_12mb/target.cfg +++ b/config/coreboot/t440pmrc_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t500_16mb/target.cfg +++ b/config/coreboot/t500_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t500_4mb/target.cfg +++ b/config/coreboot/t500_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t500_8mb/target.cfg +++ b/config/coreboot/t500_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t520_8mb/target.cfg b/config/coreboot/t520_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t520_8mb/target.cfg +++ b/config/coreboot/t520_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t530_12mb/target.cfg b/config/coreboot/t530_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/t530_12mb/target.cfg +++ b/config/coreboot/t530_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 91aa5f9b..5316aa6f 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 91aa5f9b..5316aa6f 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/w500_16mb/target.cfg +++ b/config/coreboot/w500_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/w500_4mb/target.cfg +++ b/config/coreboot/w500_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/w500_8mb/target.cfg +++ b/config/coreboot/w500_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/w530_12mb/target.cfg b/config/coreboot/w530_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/w530_12mb/target.cfg +++ b/config/coreboot/w530_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg index 33790c67..d36486ab 100644 --- a/config/coreboot/w541_12mb/target.cfg +++ b/config/coreboot/w541_12mb/target.cfg @@ -1,5 +1,5 @@ tree="haswell" -arch="i386-elf" +xarch="i386-elf" payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" diff --git a/config/coreboot/w541mrc_12mb/target.cfg b/config/coreboot/w541mrc_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/w541mrc_12mb/target.cfg +++ b/config/coreboot/w541mrc_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x200_16mb/target.cfg +++ b/config/coreboot/x200_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x200_4mb/target.cfg +++ b/config/coreboot/x200_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x200_8mb/target.cfg +++ b/config/coreboot/x200_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x201_8mb/target.cfg b/config/coreboot/x201_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x201_8mb/target.cfg +++ b/config/coreboot/x201_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x220_8mb/target.cfg b/config/coreboot/x220_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x220_8mb/target.cfg +++ b/config/coreboot/x220_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x220edp_8mb/target.cfg b/config/coreboot/x220edp_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x220edp_8mb/target.cfg +++ b/config/coreboot/x220edp_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x230_12mb/target.cfg b/config/coreboot/x230_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x230_12mb/target.cfg +++ b/config/coreboot/x230_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x230_16mb/target.cfg b/config/coreboot/x230_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x230_16mb/target.cfg +++ b/config/coreboot/x230_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x230edp_12mb/target.cfg b/config/coreboot/x230edp_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x230edp_12mb/target.cfg +++ b/config/coreboot/x230edp_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/coreboot/x230t_12mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x230t_12mb/target.cfg +++ b/config/coreboot/x230t_12mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/coreboot/x230t_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x230t_16mb/target.cfg +++ b/config/coreboot/x230t_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x301_16mb/target.cfg +++ b/config/coreboot/x301_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x301_4mb/target.cfg +++ b/config/coreboot/x301_4mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg index 981435d4..8688df3f 100644 --- a/config/coreboot/x301_8mb/target.cfg +++ b/config/coreboot/x301_8mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 91aa5f9b..5316aa6f 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 91aa5f9b..5316aa6f 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -1,5 +1,5 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" diff --git a/config/seabios/default/target.cfg b/config/seabios/default/target.cfg index 5d2b3059..8ab09802 100644 --- a/config/seabios/default/target.cfg +++ b/config/seabios/default/target.cfg @@ -1,3 +1,2 @@ -arch="i386-elf" tree="default" rev="1e1da7a963007d03a4e0e9a9e0ff17990bb1608d" diff --git a/config/u-boot/default/target.cfg b/config/u-boot/default/target.cfg index 2938f66e..fdd04865 100644 --- a/config/u-boot/default/target.cfg +++ b/config/u-boot/default/target.cfg @@ -1,3 +1,3 @@ tree="default" rev="4459ed60cb1e0562bc5b40405e2b4b9bbf766d57" # v2023.10 -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" diff --git a/config/u-boot/gru_bob/target.cfg b/config/u-boot/gru_bob/target.cfg index 5043af7e..1633e9df 100644 --- a/config/u-boot/gru_bob/target.cfg +++ b/config/u-boot/gru_bob/target.cfg @@ -1,2 +1,2 @@ tree="default" -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" diff --git a/config/u-boot/gru_kevin/target.cfg b/config/u-boot/gru_kevin/target.cfg index 5043af7e..1633e9df 100644 --- a/config/u-boot/gru_kevin/target.cfg +++ b/config/u-boot/gru_kevin/target.cfg @@ -1,2 +1,2 @@ tree="default" -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" diff --git a/config/u-boot/qemu_arm64_12mb/target.cfg b/config/u-boot/qemu_arm64_12mb/target.cfg index 5043af7e..1633e9df 100644 --- a/config/u-boot/qemu_arm64_12mb/target.cfg +++ b/config/u-boot/qemu_arm64_12mb/target.cfg @@ -1,2 +1,2 @@ tree="default" -arch="aarch64-elf" +xarch="aarch64-elf arm-eabi" diff --git a/config/u-boot/qemu_x86_12mb/target.cfg b/config/u-boot/qemu_x86_12mb/target.cfg index ccff2e3f..2c300b24 100644 --- a/config/u-boot/qemu_x86_12mb/target.cfg +++ b/config/u-boot/qemu_x86_12mb/target.cfg @@ -1,2 +1,2 @@ tree="default" -arch="i386-elf" +xarch="i386-elf" diff --git a/script/build/roms b/script/build/roms index 44e6db14..aa32ff35 100755 --- a/script/build/roms +++ b/script/build/roms @@ -21,7 +21,7 @@ kmapdir="config/grub/keymap" # target.cfg files have to specifically enable [a] payload(s) pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t" pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin" -v="romdir cbrom initmode displaymode cbcfg targetdir tree arch keymaps" +v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps" v="${v} grub_timeout ubdir board grub_scan_disk uboot_config" eval "$(setvars "n" ${pv})" eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)" @@ -84,7 +84,6 @@ configure_target() && [ "${grub_scan_disk}" != "ahci" ] && \ grub_scan_disk="both" - [ -z "$arch" ] && err "$board: arch not defined" [ -z "$tree" ] && err "$board: tree not defined" [ "${payload_memtest}" != "y" ] && payload_memtest="n" diff --git a/script/update/trees b/script/update/trees index 9186ebb1..4c969df7 100755 --- a/script/update/trees +++ b/script/update/trees @@ -10,7 +10,7 @@ set -u -e . "include/option.sh" . "include/git.sh" -eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \ +eval "$(setvars "" xarch cfgsdir codedir config config_name xlang mode \ elfdir listfile project target target_dir targets tree _f target1)" main() @@ -140,12 +140,11 @@ handle_src_tree() fi x_ mkdir -p "${elfdir}/${target}" - eval "$(setvars "" arch tree)" + eval "$(setvars "" xarch xlang tree)" . "${target_dir}/target.cfg" || \ err "handle_src_tree ${target_dir}: cannot load target.cfg" - [ -z "$arch" ] && err "handle_src_tree $project/$tree: arch unset" [ -z "$tree" ] && err "handle_src_tree $project/$tree: tree unset" codedir="src/${project}/${tree}" @@ -165,31 +164,21 @@ handle_src_tree() check_cross_compiler } -# set up cross-compiler (coreboot crossgcc) for u-boot and coreboot -# (seabios and grub currently use hostcc, not crossgcc) check_cross_compiler() { - [ "$project" = "u-boot" ] || [ "$project" = "coreboot" ] || return 0 - [ -z "$arch" ] && err "${project}/${tree}: arch isn't set" + for _xarch in $xarch; do + cbdir="src/coreboot/${tree}" + [ "$project" != "coreboot" ] && cbdir="src/coreboot/default" - _arch="$arch" - [ "$arch" = "aarch64-elf" ] && _arch="aarch64-elf arm-eabi" + x_ ./update trees -f coreboot ${cbdir#src/coreboot/} - [ "$crossgcc_ada" = "y" ] || [ "$crossgcc_ada" = "n" ] || crossgcc_ada=y - [ "$crossgcc_ada" = "y" ] || export BUILD_LANGUAGES=c + export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH" + export CROSS_COMPILE="${xarch% *}-" + [ -n "${xlang}" ] && export BUILD_LANGUAGES="$xlang" - cbdir="src/coreboot/${tree}" - [ "$project" != "coreboot" ] && cbdir="src/coreboot/default" - x_ ./update trees -f coreboot ${cbdir#src/coreboot/} - - for xarch in $_arch; do - [ -d "${cbdir}/util/crossgcc/xgcc/${xarch}/" ] && continue - x_ make -C "$cbdir" crossgcc-${xarch%-*} CPUS=$(nproc) + [ -d "${cbdir}/util/crossgcc/xgcc/${_xarch}/" ] && continue + x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$(nproc) done - - # we *must* ensure that u-boot's build system uses crossgcc first - export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH" - export CROSS_COMPILE="${_arch% *}-" } check_config() |