From b8bd1a1ce38886a4ca4cf6431a20737d802e15d9 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Fri, 18 Oct 2024 09:24:36 -0500 Subject: [PATCH] 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 | 4 ++-- .../xilinx-zynqmp/{bspa53lp64.yml => bspa53.yml} | 4 ++-- .../{bspcfc400xlp64.yml => bspcfc400x.yml} | 4 ++-- .../xilinx-zynqmp/{bspqemulp64.yml => bspqemu.yml} | 2 +- .../bsps/aarch64/xilinx-zynqmp/bspqemuilp32.yml | 2 +- .../xilinx-zynqmp/{bspzu3eglp64.yml => bspzu3eg.yml} | 4 ++-- .../bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml | 4 ++-- .../{grp_zu3eg.yml => grp_hardware.yml} | 0 spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml | 8 ++++---- spec/build/bsps/objxilinxsupportilp32.yml | 4 ++-- spec/build/bsps/objxilinxsupportlp64.yml | 8 ++++---- spec/build/bsps/optcachedata.yml | 4 ++-- spec/build/bsps/optcacheinst.yml | 4 ++-- spec/build/bsps/optclkbootcpu.yml | 4 ++-- spec/build/bsps/optclkfastidle.yml | 4 ++-- spec/build/bsps/optxilsupportpath.yml | 12 ++++++------ 16 files changed, 36 insertions(+), 36 deletions(-) rename spec/build/bsps/aarch64/xilinx-zynqmp/{bspa53lp64.yml => bspa53.yml} (92%) rename spec/build/bsps/aarch64/xilinx-zynqmp/{bspcfc400xlp64.yml => bspcfc400x.yml} (90%) rename spec/build/bsps/aarch64/xilinx-zynqmp/{bspqemulp64.yml => bspqemu.yml} (94%) rename spec/build/bsps/aarch64/xilinx-zynqmp/{bspzu3eglp64.yml => bspzu3eg.yml} (91%) rename spec/build/bsps/aarch64/xilinx-zynqmp/{grp_zu3eg.yml => grp_hardware.yml} (100%) diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml index 3da3998224..0c0d3e8e47 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/xilinx_zynqmp_ilp32_qemu - - aarch64/xilinx_zynqmp_ilp32_zu3eg + - aarch64/zynqmp_qemu_ilp32 + - aarch64/zynqmp_zu3eg_ilp32 value: - -mabi=ilp32 - -mno-outline-atomics diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspa53lp64.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspa53.yml similarity index 92% rename from spec/build/bsps/aarch64/xilinx-zynqmp/bspa53lp64.yml rename to spec/build/bsps/aarch64/xilinx-zynqmp/bspa53.yml index b63ba5a17f..a234452639 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/bspa53lp64.yml +++ b/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 diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspcfc400xlp64.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspcfc400x.yml similarity index 90% rename from spec/build/bsps/aarch64/xilinx-zynqmp/bspcfc400xlp64.yml rename to spec/build/bsps/aarch64/xilinx-zynqmp/bspcfc400x.yml index a951a51d4c..9a1018fa72 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/bspcfc400xlp64.yml +++ b/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 diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspqemulp64.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspqemu.yml similarity index 94% rename from spec/build/bsps/aarch64/xilinx-zynqmp/bspqemulp64.yml rename to spec/build/bsps/aarch64/xilinx-zynqmp/bspqemu.yml index b645f93485..c4d4f274c7 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/bspqemulp64.yml +++ b/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: diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspqemuilp32.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspqemuilp32.yml index a793983ce9..4a3559ed57 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/bspqemuilp32.yml +++ b/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: diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eg.yml similarity index 91% rename from spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml rename to spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eg.yml index a2db0c1415..2e9ef853a1 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml +++ b/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 diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml index 6329164084..5b79eca139 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml +++ b/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 diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp_hardware.yml similarity index 100% rename from spec/build/bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml rename to spec/build/bsps/aarch64/xilinx-zynqmp/grp_hardware.yml diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml index 3a78b9af38..68bfd741df 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml +++ b/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 diff --git a/spec/build/bsps/objxilinxsupportilp32.yml b/spec/build/bsps/objxilinxsupportilp32.yml index 0fc4fb0f35..5784e08858 100644 --- a/spec/build/bsps/objxilinxsupportilp32.yml +++ b/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} diff --git a/spec/build/bsps/objxilinxsupportlp64.yml b/spec/build/bsps/objxilinxsupportlp64.yml index 252851a5aa..e39bd338ee 100644 --- a/spec/build/bsps/objxilinxsupportlp64.yml +++ b/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} diff --git a/spec/build/bsps/optcachedata.yml b/spec/build/bsps/optcachedata.yml index 050af2d8d8..bc6199f509 100644 --- a/spec/build/bsps/optcachedata.yml +++ b/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 diff --git a/spec/build/bsps/optcacheinst.yml b/spec/build/bsps/optcacheinst.yml index aba3685f4c..7b832dd143 100644 --- a/spec/build/bsps/optcacheinst.yml +++ b/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 diff --git a/spec/build/bsps/optclkbootcpu.yml b/spec/build/bsps/optclkbootcpu.yml index fe6a9e7620..97f8890a06 100644 --- a/spec/build/bsps/optclkbootcpu.yml +++ b/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 diff --git a/spec/build/bsps/optclkfastidle.yml b/spec/build/bsps/optclkfastidle.yml index 6d1da0984f..2933e81460 100644 --- a/spec/build/bsps/optclkfastidle.yml +++ b/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 diff --git a/spec/build/bsps/optxilsupportpath.yml b/spec/build/bsps/optxilsupportpath.yml index 4c3b260974..39c4acf2c6 100644 --- a/spec/build/bsps/optxilsupportpath.yml +++ b/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