From a5c7cc1a0be949077d3e68fc2228ca9e1e02c5b4 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 28 Apr 2024 03:27:54 +0100
Subject: [PATCH] fix target.cfg files on dell latitudes

some latitudes still used the old style for variables
in target.cfg, specifically arch="x86_64" - lbmk used to
then check that on a big if/else and translate it to the
correct target name for crossgcc, e.g. i386-elf, arm-eabi

now it just puts the arch directly, in a new variable:
xarch

change arch="x86_64" to xarch="i386-elf" in these files.
also remove a few obsolete variables. should build now.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 config/coreboot/e5420_6mb/target.cfg  | 4 +---
 config/coreboot/e5520_6mb/target.cfg  | 4 +---
 config/coreboot/e6420_10mb/target.cfg | 4 +---
 config/coreboot/e6520_10mb/target.cfg | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/config/coreboot/e5420_6mb/target.cfg b/config/coreboot/e5420_6mb/target.cfg
index 153d4d2d..e48db5e5 100644
--- a/config/coreboot/e5420_6mb/target.cfg
+++ b/config/coreboot/e5420_6mb/target.cfg
@@ -1,6 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
@@ -8,5 +7,4 @@ payload_memtest="y"
 payload_seabios_withgrub="y"
 payload_seabios_grubonly="y"
 grub_scan_disk="ahci"
-microcode_required="n"
 status="unstable"
diff --git a/config/coreboot/e5520_6mb/target.cfg b/config/coreboot/e5520_6mb/target.cfg
index 153d4d2d..e48db5e5 100644
--- a/config/coreboot/e5520_6mb/target.cfg
+++ b/config/coreboot/e5520_6mb/target.cfg
@@ -1,6 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
@@ -8,5 +7,4 @@ payload_memtest="y"
 payload_seabios_withgrub="y"
 payload_seabios_grubonly="y"
 grub_scan_disk="ahci"
-microcode_required="n"
 status="unstable"
diff --git a/config/coreboot/e6420_10mb/target.cfg b/config/coreboot/e6420_10mb/target.cfg
index 153d4d2d..e48db5e5 100644
--- a/config/coreboot/e6420_10mb/target.cfg
+++ b/config/coreboot/e6420_10mb/target.cfg
@@ -1,6 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
@@ -8,5 +7,4 @@ payload_memtest="y"
 payload_seabios_withgrub="y"
 payload_seabios_grubonly="y"
 grub_scan_disk="ahci"
-microcode_required="n"
 status="unstable"
diff --git a/config/coreboot/e6520_10mb/target.cfg b/config/coreboot/e6520_10mb/target.cfg
index 153d4d2d..e48db5e5 100644
--- a/config/coreboot/e6520_10mb/target.cfg
+++ b/config/coreboot/e6520_10mb/target.cfg
@@ -1,6 +1,5 @@
 tree="default"
-romtype="normal"
-arch="x86_64"
+xarch="i386-elf"
 payload_grub="n"
 payload_grub_withseabios="n"
 payload_seabios="y"
@@ -8,5 +7,4 @@ payload_memtest="y"
 payload_seabios_withgrub="y"
 payload_seabios_grubonly="y"
 grub_scan_disk="ahci"
-microcode_required="n"
 status="unstable"