spec/bsps/aarch64: Update BSP naming to be more consice

This removes the xilinx and lp64 identifiers from the ZynqMP BSPs and
updates those names throughout the build system. The xilinx identifier
is being removed because it is implied by zynqmp and lp64 is being
removed because it is the default for AArch64.

This also renames grp_zu3eg.yml to grp_hardware.yml to more accurately
reflect its purpose.

Updates #5119

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/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_zu3eg_ilp32
   value:
   - -mabi=ilp32
   - -mno-outline-atomics

spec/build/bsps/aarch64/xilinx-zynqmp/bspa53.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 arch: aarch64
-bsp: xilinx_zynqmp_lp64_a53
+bsp: zynqmp_a53
 build-type: bsp
 cflags: []
 copyrights:
@@ -12,7 +12,7 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
+  uid: grp_hardware
 - role: build-dependency
   uid: linkcmds_lp64
 - role: build-dependency

spec/build/bsps/aarch64/xilinx-zynqmp/bspcfc400x.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 arch: aarch64
-bsp: xilinx_zynqmp_lp64_cfc400x
+bsp: zynqmp_cfc400x
 build-type: bsp
 cflags: []
 copyrights:
@@ -12,7 +12,7 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp_zu3eg
+  uid: grp_hardware
 - role: build-dependency
   uid: linkcmds_lp64
 - role: build-dependency

spec/build/bsps/aarch64/xilinx-zynqmp/bspqemu.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 arch: aarch64
-bsp: xilinx_zynqmp_lp64_qemu
+bsp: zynqmp_qemu
 build-type: bsp
 cflags: []
 copyrights:

spec/build/bsps/aarch64/xilinx-zynqmp/bspqemuilp32.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 arch: aarch64
-bsp: xilinx_zynqmp_ilp32_qemu
+bsp: zynqmp_qemu_ilp32
 build-type: bsp
 cflags: []
 copyrights:

spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eg.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 arch: aarch64
-bsp: xilinx_zynqmp_lp64_zu3eg
+bsp: zynqmp_zu3eg
 build-type: bsp
 cflags: []
 copyrights:
@@ -12,7 +12,7 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp_zu3eg
+  uid: grp_hardware
 - role: build-dependency
   uid: linkcmds_lp64
 - role: build-dependency

spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 arch: aarch64
-bsp: xilinx_zynqmp_ilp32_zu3eg
+bsp: zynqmp_zu3eg_ilp32
 build-type: bsp
 cflags: []
 copyrights:
@@ -12,7 +12,7 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp_zu3eg
+  uid: grp_hardware
 - role: build-dependency
   uid: linkcmds_ilp32
 - role: build-dependency

spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml

@@ -9,10 +9,10 @@ copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
 - enabled-by:
-  - aarch64/xilinx_zynqmp_lp64_a53
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-  - aarch64/xilinx_zynqmp_lp64_cfc400x
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+  - aarch64/zynqmp_a53
+  - aarch64/zynqmp_cfc400x
+  - aarch64/zynqmp_zu3eg_ilp32
+  - aarch64/zynqmp_zu3eg
   value: 0x00000000
 - enabled-by: true
   value: 0x00008000

spec/build/bsps/objxilinxsupportilp32.yml

@@ -6,8 +6,8 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by:
-- aarch64/xilinx_zynqmp_ilp32_qemu
-- aarch64/xilinx_zynqmp_ilp32_zu3eg
+- aarch64/zynqmp_qemu_ilp32
+- aarch64/zynqmp_zu3eg_ilp32
 includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}

spec/build/bsps/objxilinxsupportlp64.yml

@@ -7,10 +7,10 @@ cppflags: []
 cxxflags: []
 enabled-by:
 - bsps/aarch64/xilinx_versal
-- aarch64/xilinx_zynqmp_lp64_a53
-- aarch64/xilinx_zynqmp_lp64_cfc400x
-- aarch64/xilinx_zynqmp_lp64_qemu
-- aarch64/xilinx_zynqmp_lp64_zu3eg
+- aarch64/zynqmp_a53
+- aarch64/zynqmp_cfc400x
+- aarch64/zynqmp_qemu
+- aarch64/zynqmp_zu3eg
 includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}

spec/build/bsps/optcachedata.yml

@@ -13,8 +13,8 @@ default:
   - aarch64/a72_ilp32_qemu
   - aarch64/a72_lp64_qemu
   - aarch64/xilinx_versal_qemu
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_lp64_qemu
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_qemu
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu

spec/build/bsps/optcacheinst.yml

@@ -13,8 +13,8 @@ default:
   - aarch64/a72_ilp32_qemu
   - aarch64/a72_lp64_qemu
   - aarch64/xilinx_versal_qemu
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_lp64_qemu
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_qemu
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu

spec/build/bsps/optclkbootcpu.yml

@@ -13,8 +13,8 @@ default:
   - aarch64/a72_ilp32_qemu
   - aarch64/a72_lp64_qemu
   - aarch64/xilinx_versal_qemu
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_lp64_qemu
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_qemu
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu

spec/build/bsps/optclkfastidle.yml

@@ -12,8 +12,8 @@ default:
   - aarch64/a72_ilp32_qemu
   - aarch64/a72_lp64_qemu
   - aarch64/xilinx_versal_qemu
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_lp64_qemu
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_qemu
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu

spec/build/bsps/optxilsupportpath.yml

@@ -16,17 +16,17 @@ default:
   - bsps/arm/xilinx_zynqmp
   value: arm/cortexa9
 - enabled-by:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_zu3eg_ilp32
   value: arm/ARMv8/32bit
 - enabled-by:
   - aarch64/xilinx_versal_aiedge
   - aarch64/xilinx_versal_qemu
   - aarch64/xilinx_versal_vck190
-  - aarch64/xilinx_zynqmp_lp64_a53
-  - aarch64/xilinx_zynqmp_lp64_cfc400x
-  - aarch64/xilinx_zynqmp_lp64_qemu
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+  - aarch64/zynqmp_a53
+  - aarch64/zynqmp_cfc400x
+  - aarch64/zynqmp_qemu
+  - aarch64/zynqmp_zu3eg
   value: arm/ARMv8/64bit
 description: Set the Xilinx support path
 enabled-by: true