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>

86 files changed, 98 insertions, 98 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"