From 907ded868de161bcb077855a7d5bd3e19c43e482 Mon Sep 17 00:00:00 2001
From: Kinsey Moore <kinsey.moore@oarcorp.com>
Date: Sun, 20 Oct 2024 21:09:30 -0500
Subject: [PATCH] spec/bsps/aarch64/zynqmp: Complete the transition to
 consistent naming

These references were missed in the last renaming patch causing the
ILP32 BSP to fail to build.

Closes #5119
---
 spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml        | 2 +-
 spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml | 3 +--
 spec/build/bsps/objxilinxsupportilp32.yml            | 2 +-
 spec/build/bsps/objxilinxsupportlp64.yml             | 1 -
 spec/build/bsps/optxilsupportpath.yml                | 3 +--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
index 0c0d3e8e47..a09bfe8a7f 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
@@ -8,8 +8,8 @@ copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
 - enabled-by:
+  - aarch64/zynqmp_apu_ilp32
   - aarch64/zynqmp_qemu_ilp32
-  - aarch64/zynqmp_zu3eg_ilp32
   value:
   - -mabi=ilp32
   - -mno-outline-atomics
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
index 507a813ec7..dc96d767e9 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
@@ -10,9 +10,8 @@ copyrights:
 default:
 - enabled-by:
   - aarch64/zynqmp_apu
+  - aarch64/zynqmp_apu_ilp32
   - aarch64/zynqmp_cfc400x
-  - aarch64/zynqmp_zu3eg_ilp32
-  - aarch64/zynqmp_zu3eg
   value: 0x00000000
 - enabled-by: true
   value: 0x00008000
diff --git a/spec/build/bsps/objxilinxsupportilp32.yml b/spec/build/bsps/objxilinxsupportilp32.yml
index 5784e08858..c3eee0c5c5 100644
--- a/spec/build/bsps/objxilinxsupportilp32.yml
+++ b/spec/build/bsps/objxilinxsupportilp32.yml
@@ -6,8 +6,8 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by:
+- aarch64/zynqmp_apu_ilp32
 - aarch64/zynqmp_qemu_ilp32
-- aarch64/zynqmp_zu3eg_ilp32
 includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}
diff --git a/spec/build/bsps/objxilinxsupportlp64.yml b/spec/build/bsps/objxilinxsupportlp64.yml
index 6ca4c1d289..60ac57eccc 100644
--- a/spec/build/bsps/objxilinxsupportlp64.yml
+++ b/spec/build/bsps/objxilinxsupportlp64.yml
@@ -10,7 +10,6 @@ enabled-by:
 - aarch64/zynqmp_apu
 - aarch64/zynqmp_cfc400x
 - aarch64/zynqmp_qemu
-- aarch64/zynqmp_zu3eg
 includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}
diff --git a/spec/build/bsps/optxilsupportpath.yml b/spec/build/bsps/optxilsupportpath.yml
index ef1841d10a..fb5c02e374 100644
--- a/spec/build/bsps/optxilsupportpath.yml
+++ b/spec/build/bsps/optxilsupportpath.yml
@@ -17,7 +17,7 @@ default:
   value: arm/cortexa9
 - enabled-by:
   - aarch64/zynqmp_qemu_ilp32
-  - aarch64/zynqmp_zu3eg_ilp32
+  - aarch64/zynqmp_apu_ilp32
   value: arm/ARMv8/32bit
 - enabled-by:
   - aarch64/xilinx_versal_aiedge
@@ -26,7 +26,6 @@ default:
   - aarch64/zynqmp_apu
   - aarch64/zynqmp_cfc400x
   - aarch64/zynqmp_qemu
-  - aarch64/zynqmp_zu3eg
   value: arm/ARMv8/64bit
 description: Set the Xilinx support path
 enabled-by: true