[PATCH v1 6/6] spec/aarch64: Add BSPs for real ZynqMP hardware

[Kinsey Moore]

Add the BSPs for running on the UZ3EG Ultrascale+ Zynq MPSoC and alter
the option defaults necessary for them to run properly using the
standard BOOT.BIN configured for PetaLinux that comes in the Out-of-Box
package.
---
 spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml |  1 +
 .../aarch64/xilinx-zynqmp/bspzu3egilp32.yml   | 19 +++++++++++++++++++
 .../aarch64/xilinx-zynqmp/bspzu3eglp64.yml    | 19 +++++++++++++++++++
 .../bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml  | 18 ++++++++++++++++++
 .../bsps/aarch64/xilinx-zynqmp/optloadoff.yml |  6 +++++-
 .../bsps/aarch64/xilinx-zynqmp/optramori.yml  |  6 +++++-
 .../bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml   | 18 ++++++++++++++++++
 7 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml
 create mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml
 create mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml
 create mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml

diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
index c723b5f252..56c7694f35 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
@@ -14,6 +14,7 @@ default-by-variant:
   - -mabi=ilp32
   variants:
   - aarch64/xilinx_zynqmp_ilp32_qemu
+  - aarch64/xilinx_zynqmp_ilp32_zu3eg
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml
new file mode 100644
index 0000000000..dd7d39fb94
--- /dev/null
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3egilp32.yml
@@ -0,0 +1,19 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+arch: aarch64
+bsp: xilinx_zynqmp_ilp32_zu3eg
+build-type: bsp
+cflags: []
+copyrights:
+- Copyright (C) 2020 On-Line Applications Research (OAR)
+cppflags: []
+enabled-by: true
+family: xilinx-zynqmp
+includes: []
+install: []
+links:
+- role: build-dependency
+  uid: grp_zu3eg
+- role: build-dependency
+  uid: linkcmds_ilp32
+source: []
+type: build
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml
new file mode 100644
index 0000000000..073e91175b
--- /dev/null
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/bspzu3eglp64.yml
@@ -0,0 +1,19 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+arch: aarch64
+bsp: xilinx_zynqmp_lp64_zu3eg
+build-type: bsp
+cflags: []
+copyrights:
+- Copyright (C) 2020 On-Line Applications Research (OAR)
+cppflags: []
+enabled-by: true
+family: xilinx-zynqmp
+includes: []
+install: []
+links:
+- role: build-dependency
+  uid: grp_zu3eg
+- role: build-dependency
+  uid: linkcmds_lp64
+source: []
+type: build
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml
new file mode 100644
index 0000000000..801195cdf5
--- /dev/null
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp_zu3eg.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+copyrights:
+- Copyright (C) 2021 On-Line Applications Research (OAR)
+enabled-by: true
+includes: []
+install: []
+ldflags: []
+links:
+- role: build-dependency
+  uid: grp
+- role: build-dependency
+  uid: ../../optstarthyp
+- role: build-dependency
+  uid: tstzu3eg
+type: build
+use-after: []
+use-before: []
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
index 4546006c7e..0bdc2d61df 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
@@ -8,7 +8,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: 32768
-default-by-variant: []
+default-by-variant:
+- value: 0x0
+  variants:
+  - aarch64/xilinx_zynqmp_lp64_zu3eg
+  - aarch64/xilinx_zynqmp_ilp32_zu3eg
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
index 73c89995ba..c17febe288 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
@@ -8,7 +8,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: 0x40018000
-default-by-variant: []
+default-by-variant:
+- value: 0x10000000
+  variants:
+  - aarch64/xilinx_zynqmp_lp64_zu3eg
+  - aarch64/xilinx_zynqmp_ilp32_zu3eg
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
new file mode 100644
index 0000000000..11a8fac49b
--- /dev/null
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- set-test-state:
+    # expected to produce a fatal-error when run
+    minimum: exclude
+
+    # don't compile due to toolchain issues
+    spconfig01: exclude
+    spmisc01: exclude
+build-type: option
+copyrights:
+- Copyright (C) 2020 On-Line Applications Research (OAR)
+default: null
+default-by-variant: []
+description: ''
+enabled-by: true
+links: []
+type: build
-- 
2.20.1