bsps/aarch64: add non-secure mode and versal support

9 files changed, 68 insertions, 6 deletions

diff --git a/spec/build/bsps/aarch64/a53/grp.yml b/spec/build/bsps/aarch64/a53/grp.yml
index 19935d5a7a..9853c6deb7 100644
--- a/spec/build/bsps/aarch64/a53/grp.yml
+++ b/spec/build/bsps/aarch64/a53/grp.yml
@@ -12,6 +12,8 @@ links:
 - role: build-dependency
   uid: ../start
 - role: build-dependency
+  uid: ../optisns
+- role: build-dependency
   uid: abi
 - role: build-dependency
   uid: obj
diff --git a/spec/build/bsps/aarch64/a72/grp.yml b/spec/build/bsps/aarch64/a72/grp.yml
index 0f3e717a94..7544a47f9f 100644
--- a/spec/build/bsps/aarch64/a72/grp.yml
+++ b/spec/build/bsps/aarch64/a72/grp.yml
@@ -12,6 +12,8 @@ links:
 - role: build-dependency
   uid: ../start
 - role: build-dependency
+  uid: ../optisns
+- role: build-dependency
   uid: abi
 - role: build-dependency
   uid: obj
diff --git a/spec/build/bsps/aarch64/optisns.yml b/spec/build/bsps/aarch64/optisns.yml
new file mode 100644
index 0000000000..8db901604b
--- /dev/null
+++ b/spec/build/bsps/aarch64/optisns.yml
@@ -0,0 +1,20 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- get-boolean: null
+- define-condition: null
+build-type: option
+copyrights:
+- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
+default: true
+default-by-variant:
+- value: false
+  variants:
+  - aarch64/xilinx_versal_lp64_qemu
+  - aarch64/xilinx_versal_ilp32_qemu
+description: |
+  If set to true, then the processor starts and stays in the non-secure mode,
+  otherwise it will be in the secure mode.
+enabled-by: true
+links: []
+name: AARCH64_IS_NONSECURE
+type: build
diff --git a/spec/build/bsps/aarch64/xilinx-versal/bspqemuilp32.yml b/spec/build/bsps/aarch64/xilinx-versal/bspqemuilp32.yml
index 85d508a6f4..cdad919b1c 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/bspqemuilp32.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/bspqemuilp32.yml
@@ -12,9 +12,7 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
-  uid: tstqemu
+  uid: grp_qemu
 - role: build-dependency
   uid: linkcmds_ilp32
 source: []
diff --git a/spec/build/bsps/aarch64/xilinx-versal/bspqemulp64.yml b/spec/build/bsps/aarch64/xilinx-versal/bspqemulp64.yml
index 5df2483d34..bd8dab6a6e 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/bspqemulp64.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/bspqemulp64.yml
@@ -12,9 +12,7 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
-  uid: tstqemu
+  uid: grp_qemu
 - role: build-dependency
   uid: linkcmds_lp64
 source: []
diff --git a/spec/build/bsps/aarch64/xilinx-versal/grp.yml b/spec/build/bsps/aarch64/xilinx-versal/grp.yml
index 7c7dea0fef..977c732506 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/grp.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/grp.yml
@@ -14,6 +14,12 @@ links:
 - role: build-dependency
   uid: ../optmmupages
 - role: build-dependency
+  uid: ../optisns
+- role: build-dependency
+  uid: ../optgtusevirt
+- role: build-dependency
+  uid: ../optgtuseps
+- role: build-dependency
   uid: abi
 - role: build-dependency
   uid: obj
diff --git a/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml b/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml
new file mode 100644
index 0000000000..71d8c9ac49
--- /dev/null
+++ b/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+copyrights:
+- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
+enabled-by: true
+includes: []
+install: []
+ldflags: []
+links:
+- role: build-dependency
+  uid: grp
+- role: build-dependency
+  uid: ../../optstartmon
+- role: build-dependency
+  uid: tstqemu
+type: build
+use-after: []
+use-before: []
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
index 16e2b8a7e9..03ccdbbc8b 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
@@ -14,6 +14,8 @@ links:
 - role: build-dependency
   uid: ../optmmupages
 - role: build-dependency
+  uid: ../optisns
+- role: build-dependency
   uid: abi
 - role: build-dependency
   uid: obj
diff --git a/spec/build/bsps/optstartmon.yml b/spec/build/bsps/optstartmon.yml
new file mode 100644
index 0000000000..9c48aad926
--- /dev/null
+++ b/spec/build/bsps/optstartmon.yml
@@ -0,0 +1,16 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- get-boolean: null
+- define-condition: null
+build-type: option
+copyrights:
+- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
+default: true
+default-by-variant: []
+description: |
+  If set to true, then a system start in monitor mode (EL3) is
+  supported, otherwise it is unsupported.
+enabled-by: true
+links: []
+name: BSP_START_IN_EL3_MONITOR_MODE_SUPPORT
+type: build