[PATCH 3/5] bsps/arm: Unify ARM Generic Timer options

[Sebastian Huber]

Update #4202.
---
 .../optgentmrfreq.yml => optgtfreq.yml}           |  9 +++++----
 .../optgentmrusevirt.yml => optgtusevirt.yml}     |  3 ++-
 spec/build/bsps/arm/xen/bspxen.yml                |  2 +-
 spec/build/bsps/arm/xen/optgentmrusevirt.yml      | 15 ---------------
 .../bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml    |  8 ++++----
 5 files changed, 12 insertions(+), 25 deletions(-)
 rename spec/build/bsps/arm/{xilinx-zynqmp/optgentmrfreq.yml => optgtfreq.yml} (67%)
 rename spec/build/bsps/arm/{xilinx-zynqmp/optgentmrusevirt.yml => optgtusevirt.yml} (71%)
 delete mode 100644 spec/build/bsps/arm/xen/optgentmrusevirt.yml

diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml b/spec/build/bsps/arm/optgtfreq.yml
similarity index 67%
rename from spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml
rename to spec/build/bsps/arm/optgtfreq.yml
index a31630ebd6..adfacfaed2 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml
+++ b/spec/build/bsps/arm/optgtfreq.yml
@@ -1,14 +1,15 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
-- get-boolean: null
-- define-condition: null
+- get-integer: null
+- format-and-define: null
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
+default: null
 default-by-variant: []
 description: |
-  ARM generic timer frequency in Hz
+  Defines the frequency in Hz of the ARM Generic Timer.
+format: '{}'
 enabled-by: true
 links: []
 name: ARM_GENERIC_TIMER_FREQ
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml b/spec/build/bsps/arm/optgtusevirt.yml
similarity index 71%
rename from spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml
rename to spec/build/bsps/arm/optgtusevirt.yml
index 794f66244b..b443cc1d32 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml
+++ b/spec/build/bsps/arm/optgtusevirt.yml
@@ -8,7 +8,8 @@ copyrights:
 default: false
 default-by-variant: []
 description: |
-  Use virtual ARM generic timer
+  If set to true, then the clock driver uses the Virtual Timer of the ARM
+  Generic Timer, otherwise it uses the Physical Timer (EL1).
 enabled-by: true
 links: []
 name: ARM_GENERIC_TIMER_USE_VIRTUAL
diff --git a/spec/build/bsps/arm/xen/bspxen.yml b/spec/build/bsps/arm/xen/bspxen.yml
index 3784315acd..1a3db8d172 100644
--- a/spec/build/bsps/arm/xen/bspxen.yml
+++ b/spec/build/bsps/arm/xen/bspxen.yml
@@ -28,7 +28,7 @@ links:
 - role: build-dependency
   uid: abi
 - role: build-dependency
-  uid: optgentmrusevirt
+  uid: ../optgtusevirt
 - role: build-dependency
   uid: optgentmunmask
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xen/optgentmrusevirt.yml b/spec/build/bsps/arm/xen/optgentmrusevirt.yml
deleted file mode 100644
index cfcc9e86d3..0000000000
--- a/spec/build/bsps/arm/xen/optgentmrusevirt.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-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) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant: []
-description: |
-  use virtual ARM generic timer
-enabled-by: true
-links: []
-name: ARM_GENERIC_TIMER_USE_VIRTUAL
-type: build
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
index 95cbc51436..b8cc1c043c 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
@@ -29,6 +29,10 @@ links:
   uid: abi
 - role: build-dependency
   uid: objsmp
+- role: build-dependency
+  uid: ../optgtfreq
+- role: build-dependency
+  uid: ../optgtusevirt
 - role: build-dependency
   uid: optcachedata
 - role: build-dependency
@@ -41,10 +45,6 @@ links:
   uid: optconirq
 - role: build-dependency
   uid: ../../optconminor
-- role: build-dependency
-  uid: optgentmrfreq
-- role: build-dependency
-  uid: optgentmrusevirt
 - role: build-dependency
   uid: optint0len
 - role: build-dependency
-- 
2.26.2