[rtems commit] bsps/arm: Unify ARM Generic Timer options

Sebastian Huber sebh at rtems.org
Thu Dec 10 08:08:09 UTC 2020


Module:    rtems
Branch:    master
Commit:    5efa15b49d47ace494410e423fc69213d9c2a4e9
Changeset: http://git.rtems.org/rtems/commit/?id=5efa15b49d47ace494410e423fc69213d9c2a4e9

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Dec  4 12:07:44 2020 +0100

bsps/arm: Unify ARM Generic Timer options

Update #4202.

---

 .../{xilinx-zynqmp/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 ---------------
 spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml     |  8 ++++----
 5 files changed, 12 insertions(+), 25 deletions(-)

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 a31630e..adfacfa 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 794f662..b443cc1 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 3784315..1a3db8d 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 cfcc9e8..0000000
--- 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 95cbc51..b8cc1c0 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
@@ -30,6 +30,10 @@ links:
 - role: build-dependency
   uid: objsmp
 - role: build-dependency
+  uid: ../optgtfreq
+- role: build-dependency
+  uid: ../optgtusevirt
+- role: build-dependency
   uid: optcachedata
 - role: build-dependency
   uid: optcacheinst
@@ -42,10 +46,6 @@ links:
 - role: build-dependency
   uid: ../../optconminor
 - role: build-dependency
-  uid: optgentmrfreq
-- role: build-dependency
-  uid: optgentmrusevirt
-- role: build-dependency
   uid: optint0len
 - role: build-dependency
   uid: optint0ori



More information about the vc mailing list