From 5efa15b49d47ace494410e423fc69213d9c2a4e9 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 4 Dec 2020 12:07:44 +0100 Subject: bsps/arm: Unify ARM Generic Timer options Update #4202. --- spec/build/bsps/arm/optgtfreq.yml | 16 ++++++++++++++++ spec/build/bsps/arm/optgtusevirt.yml | 16 ++++++++++++++++ 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 ++++---- spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml | 15 --------------- spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml | 15 --------------- 7 files changed, 37 insertions(+), 50 deletions(-) create mode 100644 spec/build/bsps/arm/optgtfreq.yml create mode 100644 spec/build/bsps/arm/optgtusevirt.yml delete mode 100644 spec/build/bsps/arm/xen/optgentmrusevirt.yml delete mode 100644 spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml delete mode 100644 spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml (limited to 'spec/build/bsps/arm') diff --git a/spec/build/bsps/arm/optgtfreq.yml b/spec/build/bsps/arm/optgtfreq.yml new file mode 100644 index 0000000000..adfacfaed2 --- /dev/null +++ b/spec/build/bsps/arm/optgtfreq.yml @@ -0,0 +1,16 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- format-and-define: null +build-type: option +copyrights: +- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +default: null +default-by-variant: [] +description: | + Defines the frequency in Hz of the ARM Generic Timer. +format: '{}' +enabled-by: true +links: [] +name: ARM_GENERIC_TIMER_FREQ +type: build diff --git a/spec/build/bsps/arm/optgtusevirt.yml b/spec/build/bsps/arm/optgtusevirt.yml new file mode 100644 index 0000000000..b443cc1d32 --- /dev/null +++ b/spec/build/bsps/arm/optgtusevirt.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) 2020 embedded brains GmbH (http://www.embedded-brains.de) +default: false +default-by-variant: [] +description: | + 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 +type: build 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 diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml b/spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.yml deleted file mode 100644 index a31630ebd6..0000000000 --- a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrfreq.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: false -default-by-variant: [] -description: | - ARM generic timer frequency in Hz -enabled-by: true -links: [] -name: ARM_GENERIC_TIMER_FREQ -type: build diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml b/spec/build/bsps/arm/xilinx-zynqmp/optgentmrusevirt.yml deleted file mode 100644 index 794f66244b..0000000000 --- a/spec/build/bsps/arm/xilinx-zynqmp/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: false -default-by-variant: [] -description: | - Use virtual ARM generic timer -enabled-by: true -links: [] -name: ARM_GENERIC_TIMER_USE_VIRTUAL -type: build -- cgit v1.2.3