summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/coreboot/d510mo/target.cfg2
-rw-r--r--config/coreboot/d510mo_16mb/target.cfg2
-rw-r--r--config/coreboot/d945gclf_512kb/target.cfg2
-rw-r--r--config/coreboot/d945gclf_8mb/target.cfg2
-rw-r--r--config/coreboot/default/target.cfg2
-rw-r--r--config/coreboot/dell/target.cfg2
-rw-r--r--config/coreboot/e6400_4mb/target.cfg2
-rw-r--r--config/coreboot/e6430_12mb/target.cfg2
-rw-r--r--config/coreboot/e6530_12mb/target.cfg2
-rw-r--r--config/coreboot/fam15h_rdimm/target.cfg2
-rw-r--r--config/coreboot/fam15h_udimm/target.cfg2
-rw-r--r--config/coreboot/g43t-am3/target.cfg2
-rw-r--r--config/coreboot/g43t-am3_16mb/target.cfg2
-rw-r--r--config/coreboot/ga-g41m-es2l/target.cfg2
-rw-r--r--config/coreboot/gru_bob/target.cfg2
-rw-r--r--config/coreboot/gru_kevin/target.cfg2
-rw-r--r--config/coreboot/haswell/target.cfg2
-rw-r--r--config/coreboot/hp2170p_16mb/target.cfg2
-rw-r--r--config/coreboot/hp2560p_8mb/target.cfg2
-rw-r--r--config/coreboot/hp2570p_16mb/target.cfg2
-rw-r--r--config/coreboot/hp8200sff_4mb/target.cfg2
-rw-r--r--config/coreboot/hp8200sff_8mb/target.cfg2
-rw-r--r--config/coreboot/hp8300usdt_16mb/target.cfg2
-rw-r--r--config/coreboot/hp8460pintel_8mb/target.cfg2
-rw-r--r--config/coreboot/hp8470pintel_16mb/target.cfg2
-rw-r--r--config/coreboot/hp9470m_16mb/target.cfg2
-rw-r--r--config/coreboot/kcma-d8-rdimm_16mb/target.cfg2
-rw-r--r--config/coreboot/kcma-d8-rdimm_2mb/target.cfg2
-rw-r--r--config/coreboot/kcma-d8-udimm_16mb/target.cfg2
-rw-r--r--config/coreboot/kcma-d8-udimm_2mb/target.cfg2
-rw-r--r--config/coreboot/kfsn4-dre_1mb/target.cfg2
-rw-r--r--config/coreboot/kfsn4-dre_2mb/target.cfg2
-rw-r--r--config/coreboot/kgpe-d16-rdimm_16mb/target.cfg2
-rw-r--r--config/coreboot/kgpe-d16-rdimm_2mb/target.cfg2
-rw-r--r--config/coreboot/kgpe-d16-udimm_16mb/target.cfg2
-rw-r--r--config/coreboot/kgpe-d16-udimm_2mb/target.cfg2
-rw-r--r--config/coreboot/macbook11/target.cfg2
-rw-r--r--config/coreboot/macbook11_16mb/target.cfg2
-rw-r--r--config/coreboot/macbook21/target.cfg2
-rw-r--r--config/coreboot/macbook21_16mb/target.cfg2
-rw-r--r--config/coreboot/qemu_arm64_12mb/target.cfg2
-rw-r--r--config/coreboot/qemu_x86_12mb/target.cfg2
-rw-r--r--config/coreboot/r400_16mb/target.cfg2
-rw-r--r--config/coreboot/r400_4mb/target.cfg2
-rw-r--r--config/coreboot/r400_8mb/target.cfg2
-rw-r--r--config/coreboot/r500_4mb/target.cfg2
-rw-r--r--config/coreboot/t1650_12mb/target.cfg2
-rw-r--r--config/coreboot/t400_16mb/target.cfg2
-rw-r--r--config/coreboot/t400_4mb/target.cfg2
-rw-r--r--config/coreboot/t400_8mb/target.cfg2
-rw-r--r--config/coreboot/t420_8mb/target.cfg2
-rw-r--r--config/coreboot/t420s_8mb/target.cfg2
-rw-r--r--config/coreboot/t430_12mb/target.cfg2
-rw-r--r--config/coreboot/t440plibremrc_12mb/target.cfg2
-rw-r--r--config/coreboot/t440pmrc_12mb/target.cfg2
-rw-r--r--config/coreboot/t500_16mb/target.cfg2
-rw-r--r--config/coreboot/t500_4mb/target.cfg2
-rw-r--r--config/coreboot/t500_8mb/target.cfg2
-rw-r--r--config/coreboot/t520_8mb/target.cfg2
-rw-r--r--config/coreboot/t530_12mb/target.cfg2
-rw-r--r--config/coreboot/t60_16mb_intelgpu/target.cfg2
-rw-r--r--config/coreboot/t60_intelgpu/target.cfg2
-rw-r--r--config/coreboot/w500_16mb/target.cfg2
-rw-r--r--config/coreboot/w500_4mb/target.cfg2
-rw-r--r--config/coreboot/w500_8mb/target.cfg2
-rw-r--r--config/coreboot/w530_12mb/target.cfg2
-rw-r--r--config/coreboot/w541_12mb/target.cfg2
-rw-r--r--config/coreboot/w541mrc_12mb/target.cfg2
-rw-r--r--config/coreboot/x200_16mb/target.cfg2
-rw-r--r--config/coreboot/x200_4mb/target.cfg2
-rw-r--r--config/coreboot/x200_8mb/target.cfg2
-rw-r--r--config/coreboot/x201_8mb/target.cfg2
-rw-r--r--config/coreboot/x220_8mb/target.cfg2
-rw-r--r--config/coreboot/x220edp_8mb/target.cfg2
-rw-r--r--config/coreboot/x230_12mb/target.cfg2
-rw-r--r--config/coreboot/x230_16mb/target.cfg2
-rw-r--r--config/coreboot/x230edp_12mb/target.cfg2
-rw-r--r--config/coreboot/x230t_12mb/target.cfg2
-rw-r--r--config/coreboot/x230t_16mb/target.cfg2
-rw-r--r--config/coreboot/x301_16mb/target.cfg2
-rw-r--r--config/coreboot/x301_4mb/target.cfg2
-rw-r--r--config/coreboot/x301_8mb/target.cfg2
-rw-r--r--config/coreboot/x60/target.cfg2
-rw-r--r--config/coreboot/x60_16mb/target.cfg2
-rw-r--r--config/seabios/default/target.cfg2
-rw-r--r--config/u-boot/default/target.cfg2
-rw-r--r--config/u-boot/gru_bob/target.cfg2
-rw-r--r--config/u-boot/gru_kevin/target.cfg2
-rw-r--r--config/u-boot/qemu_arm64_12mb/target.cfg2
-rw-r--r--config/u-boot/qemu_x86_12mb/target.cfg2
90 files changed, 90 insertions, 90 deletions
diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg
index b127411a..2b1d1a7c 100644
--- a/config/coreboot/d510mo/target.cfg
+++ b/config/coreboot/d510mo/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 1bfff85a..8b1e41ba 100644
--- a/config/coreboot/d510mo_16mb/target.cfg
+++ b/config/coreboot/d510mo_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 4b9708e1..153cd806 100644
--- a/config/coreboot/d945gclf_512kb/target.cfg
+++ b/config/coreboot/d945gclf_512kb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_32"
+arch="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 4b9708e1..153cd806 100644
--- a/config/coreboot/d945gclf_8mb/target.cfg
+++ b/config/coreboot/d945gclf_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_32"
+arch="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 076e7555..23f93b09 100644
--- a/config/coreboot/default/target.cfg
+++ b/config/coreboot/default/target.cfg
@@ -1,4 +1,4 @@
tree="default"
romtype="normal"
rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
-arch="x86_64"
+arch="i386-elf"
diff --git a/config/coreboot/dell/target.cfg b/config/coreboot/dell/target.cfg
index 678e48c4..19bd68be 100644
--- a/config/coreboot/dell/target.cfg
+++ b/config/coreboot/dell/target.cfg
@@ -1,4 +1,4 @@
tree="dell"
romtype="normal"
rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6"
-arch="x86_64"
+arch="i386-elf"
diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg
index eea2b6f9..2a95482c 100644
--- a/config/coreboot/e6400_4mb/target.cfg
+++ b/config/coreboot/e6400_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="dell"
romtype="4MiB ICH9 IFD NOR flash"
-arch="x86_64"
+arch="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 1cf0792e..4feb9909 100644
--- a/config/coreboot/e6430_12mb/target.cfg
+++ b/config/coreboot/e6430_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 1cf0792e..4feb9909 100644
--- a/config/coreboot/e6530_12mb/target.cfg
+++ b/config/coreboot/e6530_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 3d5a4dc4..8d1f6a14 100644
--- a/config/coreboot/fam15h_rdimm/target.cfg
+++ b/config/coreboot/fam15h_rdimm/target.cfg
@@ -1,7 +1,7 @@
tree="fam15h_rdimm"
romtype="normal"
rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
-arch="x86_64"
+arch="i386-elf"
payload_grub="n"
payload_grub_withseabios="n"
payload_seabios="n"
diff --git a/config/coreboot/fam15h_udimm/target.cfg b/config/coreboot/fam15h_udimm/target.cfg
index d987c574..0e451af6 100644
--- a/config/coreboot/fam15h_udimm/target.cfg
+++ b/config/coreboot/fam15h_udimm/target.cfg
@@ -1,7 +1,7 @@
tree="fam15h_udimm"
romtype="normal"
rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
-arch="x86_64"
+arch="i386-elf"
payload_grub="n"
payload_grub_withseabios="n"
payload_seabios="n"
diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg
index ac38a6c7..0308cf27 100644
--- a/config/coreboot/g43t-am3/target.cfg
+++ b/config/coreboot/g43t-am3/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_memtest="y"
microcode_required="n"
diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg
index ac38a6c7..0308cf27 100644
--- a/config/coreboot/g43t-am3_16mb/target.cfg
+++ b/config/coreboot/g43t-am3_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_memtest="y"
microcode_required="n"
diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg
index 047fced1..350c39d2 100644
--- a/config/coreboot/ga-g41m-es2l/target.cfg
+++ b/config/coreboot/ga-g41m-es2l/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 928029cb..10e1e969 100644
--- a/config/coreboot/gru_bob/target.cfg
+++ b/config/coreboot/gru_bob/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="AArch64"
+arch="aarch64-elf"
payload_uboot="y"
vendorfiles="n"
microcode_required="n"
diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg
index 928029cb..10e1e969 100644
--- a/config/coreboot/gru_kevin/target.cfg
+++ b/config/coreboot/gru_kevin/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="AArch64"
+arch="aarch64-elf"
payload_uboot="y"
vendorfiles="n"
microcode_required="n"
diff --git a/config/coreboot/haswell/target.cfg b/config/coreboot/haswell/target.cfg
index f96c5fc2..e9659265 100644
--- a/config/coreboot/haswell/target.cfg
+++ b/config/coreboot/haswell/target.cfg
@@ -1,4 +1,4 @@
tree="haswell"
romtype="normal"
rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b"
-arch="x86_64"
+arch="i386-elf"
diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg
index 784e020b..bcdf9466 100644
--- a/config/coreboot/hp2170p_16mb/target.cfg
+++ b/config/coreboot/hp2170p_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 784e020b..bcdf9466 100644
--- a/config/coreboot/hp2560p_8mb/target.cfg
+++ b/config/coreboot/hp2560p_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 784e020b..bcdf9466 100644
--- a/config/coreboot/hp2570p_16mb/target.cfg
+++ b/config/coreboot/hp2570p_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 1467dcd2..63112911 100644
--- a/config/coreboot/hp8200sff_4mb/target.cfg
+++ b/config/coreboot/hp8200sff_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 1467dcd2..63112911 100644
--- a/config/coreboot/hp8200sff_8mb/target.cfg
+++ b/config/coreboot/hp8200sff_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 1467dcd2..63112911 100644
--- a/config/coreboot/hp8300usdt_16mb/target.cfg
+++ b/config/coreboot/hp8300usdt_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 784e020b..bcdf9466 100644
--- a/config/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/coreboot/hp8460pintel_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 784e020b..bcdf9466 100644
--- a/config/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/coreboot/hp8470pintel_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 784e020b..bcdf9466 100644
--- a/config/coreboot/hp9470m_16mb/target.cfg
+++ b/config/coreboot/hp9470m_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 dd6fac7c..a71ab92b 100644
--- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
+++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_rdimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_grub="y"
payload_grub_withseabios="y"
payload_seabios="y"
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
index dd6fac7c..a71ab92b 100644
--- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
+++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_rdimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_grub="y"
payload_grub_withseabios="y"
payload_seabios="y"
diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg
index 6e4887a4..3f1f7c3e 100644
--- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg
+++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_udimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_grub="y"
payload_grub_withseabios="y"
payload_seabios="y"
diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg
index 6e4887a4..3f1f7c3e 100644
--- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg
+++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_udimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_grub="y"
payload_grub_withseabios="y"
payload_seabios="y"
diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg
index 5530255d..c5cb67b1 100644
--- a/config/coreboot/kfsn4-dre_1mb/target.cfg
+++ b/config/coreboot/kfsn4-dre_1mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_udimm"
romtype="normal"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_memtest="y"
crossgcc_ada="n"
diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg
index 95ec4944..debe16fd 100644
--- a/config/coreboot/kfsn4-dre_2mb/target.cfg
+++ b/config/coreboot/kfsn4-dre_2mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_udimm"
romtype="normal"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
index 3263842d..883d764f 100644
--- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
+++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_rdimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
index 3263842d..883d764f 100644
--- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
+++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_rdimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg
index a833cda9..d767dd7e 100644
--- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg
+++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_udimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg
index a833cda9..d767dd7e 100644
--- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg
+++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg
@@ -1,6 +1,6 @@
tree="fam15h_udimm"
romtype="d8d16sas"
-arch="x86_64"
+arch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg
index 117e160d..ea9074ea 100644
--- a/config/coreboot/macbook11/target.cfg
+++ b/config/coreboot/macbook11/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_32"
+arch="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 117e160d..ea9074ea 100644
--- a/config/coreboot/macbook11_16mb/target.cfg
+++ b/config/coreboot/macbook11_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_32"
+arch="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 135e894b..49a676da 100644
--- a/config/coreboot/macbook21/target.cfg
+++ b/config/coreboot/macbook21/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_64"
+arch="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 135e894b..49a676da 100644
--- a/config/coreboot/macbook21_16mb/target.cfg
+++ b/config/coreboot/macbook21_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_64"
+arch="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 928029cb..10e1e969 100644
--- a/config/coreboot/qemu_arm64_12mb/target.cfg
+++ b/config/coreboot/qemu_arm64_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="AArch64"
+arch="aarch64-elf"
payload_uboot="y"
vendorfiles="n"
microcode_required="n"
diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg
index cefa53aa..a835bc4a 100644
--- a/config/coreboot/qemu_x86_12mb/target.cfg
+++ b/config/coreboot/qemu_x86_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/r400_16mb/target.cfg
+++ b/config/coreboot/r400_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/r400_4mb/target.cfg
+++ b/config/coreboot/r400_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/r400_8mb/target.cfg
+++ b/config/coreboot/r400_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/r500_4mb/target.cfg
+++ b/config/coreboot/r500_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 d018dba1..ec12cd4f 100644
--- a/config/coreboot/t1650_12mb/target.cfg
+++ b/config/coreboot/t1650_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/t400_16mb/target.cfg
+++ b/config/coreboot/t400_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/t400_4mb/target.cfg
+++ b/config/coreboot/t400_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/t400_8mb/target.cfg
+++ b/config/coreboot/t400_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/t420_8mb/target.cfg
+++ b/config/coreboot/t420_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/t420s_8mb/target.cfg
+++ b/config/coreboot/t420s_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/t430_12mb/target.cfg
+++ b/config/coreboot/t430_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 39586f15..4b46a5a4 100644
--- a/config/coreboot/t440plibremrc_12mb/target.cfg
+++ b/config/coreboot/t440plibremrc_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="haswell"
romtype="t440p"
-arch="x86_64"
+arch="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 f86e6406..aca758d4 100644
--- a/config/coreboot/t440pmrc_12mb/target.cfg
+++ b/config/coreboot/t440pmrc_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="t440p"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/t500_16mb/target.cfg
+++ b/config/coreboot/t500_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/t500_4mb/target.cfg
+++ b/config/coreboot/t500_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/t500_8mb/target.cfg
+++ b/config/coreboot/t500_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/t520_8mb/target.cfg
+++ b/config/coreboot/t520_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/t530_12mb/target.cfg
+++ b/config/coreboot/t530_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 8f4eb55e..3f803f95 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_32"
+arch="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 8f4eb55e..3f803f95 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_32"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/w500_16mb/target.cfg
+++ b/config/coreboot/w500_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/w500_4mb/target.cfg
+++ b/config/coreboot/w500_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/w500_8mb/target.cfg
+++ b/config/coreboot/w500_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/w530_12mb/target.cfg
+++ b/config/coreboot/w530_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 39586f15..4b46a5a4 100644
--- a/config/coreboot/w541_12mb/target.cfg
+++ b/config/coreboot/w541_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="haswell"
romtype="t440p"
-arch="x86_64"
+arch="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 f86e6406..aca758d4 100644
--- a/config/coreboot/w541mrc_12mb/target.cfg
+++ b/config/coreboot/w541mrc_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="t440p"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/x200_16mb/target.cfg
+++ b/config/coreboot/x200_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/x200_4mb/target.cfg
+++ b/config/coreboot/x200_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/x200_8mb/target.cfg
+++ b/config/coreboot/x200_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x201_8mb/target.cfg
+++ b/config/coreboot/x201_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x220_8mb/target.cfg
+++ b/config/coreboot/x220_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x220edp_8mb/target.cfg
+++ b/config/coreboot/x220edp_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x230_12mb/target.cfg
+++ b/config/coreboot/x230_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x230_16mb/target.cfg
+++ b/config/coreboot/x230_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x230edp_12mb/target.cfg
+++ b/config/coreboot/x230edp_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x230t_12mb/target.cfg
+++ b/config/coreboot/x230t_12mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 f5dfa8d8..0337af2c 100644
--- a/config/coreboot/x230t_16mb/target.cfg
+++ b/config/coreboot/x230t_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/x301_16mb/target.cfg
+++ b/config/coreboot/x301_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/x301_4mb/target.cfg
+++ b/config/coreboot/x301_4mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 58ae8733..4269b2a5 100644
--- a/config/coreboot/x301_8mb/target.cfg
+++ b/config/coreboot/x301_8mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="normal"
-arch="x86_64"
+arch="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 8f4eb55e..3f803f95 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_32"
+arch="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 8f4eb55e..3f803f95 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@@ -1,6 +1,6 @@
tree="default"
romtype="i945 laptop"
-arch="x86_32"
+arch="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 9e116d13..5d2b3059 100644
--- a/config/seabios/default/target.cfg
+++ b/config/seabios/default/target.cfg
@@ -1,3 +1,3 @@
-arch="x86_32"
+arch="i386-elf"
tree="default"
rev="1e1da7a963007d03a4e0e9a9e0ff17990bb1608d"
diff --git a/config/u-boot/default/target.cfg b/config/u-boot/default/target.cfg
index 1eda306f..2938f66e 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"
+arch="aarch64-elf"
diff --git a/config/u-boot/gru_bob/target.cfg b/config/u-boot/gru_bob/target.cfg
index 6532f257..5043af7e 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"
+arch="aarch64-elf"
diff --git a/config/u-boot/gru_kevin/target.cfg b/config/u-boot/gru_kevin/target.cfg
index 6532f257..5043af7e 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"
+arch="aarch64-elf"
diff --git a/config/u-boot/qemu_arm64_12mb/target.cfg b/config/u-boot/qemu_arm64_12mb/target.cfg
index 6532f257..5043af7e 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"
+arch="aarch64-elf"
diff --git a/config/u-boot/qemu_x86_12mb/target.cfg b/config/u-boot/qemu_x86_12mb/target.cfg
index 24b7cb0c..ccff2e3f 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="x86_64"
+arch="i386-elf"