diff --git a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
index 1b2a4b4eec..20818bcfe7 100644
--- a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
+++ b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
@@ -65,8 +65,6 @@ links:
   uid: optcachedata
 - role: build-dependency
   uid: optcacheinst
-- role: build-dependency
-  uid: optclkfastidle
 - role: build-dependency
   uid: optconcfg
 - role: build-dependency
diff --git a/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml b/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml
deleted file mode 100644
index f0b83e1402..0000000000
--- a/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml
+++ /dev/null
@@ -1,21 +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 & Co. KG
-default:
-- enabled-by:
-  - arm/lm3s6965_qemu
-  - arm/realview_pbx_a9_qemu
-  - arm/xilinx_zynq_a9_qemu
-  value: true
-- enabled-by: true
-  value: false
-description: |
-  This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
-enabled-by: true
-links: []
-name: CLOCK_DRIVER_USE_FAST_IDLE
-type: build
diff --git a/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml b/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml
index a2d1e8d880..7d21ebc08c 100644
--- a/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml
+++ b/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml
@@ -33,8 +33,6 @@ links:
   uid: optcachedata
 - role: build-dependency
   uid: optcacheinst
-- role: build-dependency
-  uid: optclkfastidle
 - role: build-dependency
   uid: ../optmmusmallpages
 - role: build-dependency
diff --git a/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml b/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml
deleted file mode 100644
index f0b83e1402..0000000000
--- a/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml
+++ /dev/null
@@ -1,21 +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 & Co. KG
-default:
-- enabled-by:
-  - arm/lm3s6965_qemu
-  - arm/realview_pbx_a9_qemu
-  - arm/xilinx_zynq_a9_qemu
-  value: true
-- enabled-by: true
-  value: false
-description: |
-  This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
-enabled-by: true
-links: []
-name: CLOCK_DRIVER_USE_FAST_IDLE
-type: build
diff --git a/spec/build/bsps/arm/xilinx-zynq/grp.yml b/spec/build/bsps/arm/xilinx-zynq/grp.yml
index 79a75de9c8..a5f0efc7c3 100644
--- a/spec/build/bsps/arm/xilinx-zynq/grp.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/grp.yml
@@ -30,8 +30,6 @@ links:
   uid: optcacheinst
 - role: build-dependency
   uid: optclkcpu1x
-- role: build-dependency
-  uid: optclkfastidle
 - role: build-dependency
   uid: optclkuart
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml b/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml
deleted file mode 100644
index f0b83e1402..0000000000
--- a/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml
+++ /dev/null
@@ -1,21 +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 & Co. KG
-default:
-- enabled-by:
-  - arm/lm3s6965_qemu
-  - arm/realview_pbx_a9_qemu
-  - arm/xilinx_zynq_a9_qemu
-  value: true
-- enabled-by: true
-  value: false
-description: |
-  This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
-enabled-by: true
-links: []
-name: CLOCK_DRIVER_USE_FAST_IDLE
-type: build
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
index fe0b9b451f..2fb2ca1b5d 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
@@ -36,8 +36,6 @@ links:
   uid: optcachedata
 - role: build-dependency
   uid: optcacheinst
-- role: build-dependency
-  uid: optclkfastidle
 - role: build-dependency
   uid: optclkuart
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
deleted file mode 100644
index f0b83e1402..0000000000
--- a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
+++ /dev/null
@@ -1,21 +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 & Co. KG
-default:
-- enabled-by:
-  - arm/lm3s6965_qemu
-  - arm/realview_pbx_a9_qemu
-  - arm/xilinx_zynq_a9_qemu
-  value: true
-- enabled-by: true
-  value: false
-description: |
-  This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
-enabled-by: true
-links: []
-name: CLOCK_DRIVER_USE_FAST_IDLE
-type: build
diff --git a/spec/build/bsps/obj.yml b/spec/build/bsps/obj.yml
index 575627f9af..186415f4cd 100644
--- a/spec/build/bsps/obj.yml
+++ b/spec/build/bsps/obj.yml
@@ -73,6 +73,8 @@ links:
   uid: objnosmp
 - role: build-dependency
   uid: optclkbootcpu
+- role: build-dependency
+  uid: optclkfastidle
 source:
 - bsps/shared/dev/display/disp_hcms29xx.c
 - bsps/shared/dev/display/font_hcms29xx.c
diff --git a/spec/build/bsps/optclkfastidle.yml b/spec/build/bsps/optclkfastidle.yml
index faa937cd47..8dd523d4d2 100644
--- a/spec/build/bsps/optclkfastidle.yml
+++ b/spec/build/bsps/optclkfastidle.yml
@@ -18,6 +18,7 @@ default:
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu
   - microblaze/kcu105_qemu
+  - powerpc/psim
   - powerpc/qemuppc
   - powerpc/qemuprep
   - powerpc/qemuprep-altivec
@@ -28,7 +29,34 @@ description: |
   Set a mode where the time runs as fast as possible when a clock ISR occurs
   while the IDLE thread is executing; this can significantly reduce simulation
   times
-enabled-by: true
+enabled-by:
+  - aarch64/a53_ilp32_qemu
+  - aarch64/a53_lp64_qemu
+  - aarch64/a72_ilp32_qemu
+  - aarch64/a72_lp64_qemu
+  - aarch64/versal_qemu
+  - aarch64/zynqmp_qemu_ilp32
+  - aarch64/zynqmp_qemu
+  - arm/altcycv_devkit
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
+  - arm/xilinx_zynqmp_ultra96
+  - microblaze/kcu105_qemu
+  - powerpc/psim
+  - powerpc/qemuppc
+  - powerpc/qemuprep
+  - powerpc/qemuprep-altivec
+  - riscv/rv32i
+  - riscv/rv32iac
+  - riscv/rv32im
+  - riscv/rv32imac
+  - riscv/rv32imafc
+  - riscv/rv32imafd
+  - riscv/rv32imafdc
+  - riscv/rv64imac
+  - riscv/rv64imafd
+  - riscv/rv64imafdc
 links: []
 name: CLOCK_DRIVER_USE_FAST_IDLE
 type: build
diff --git a/spec/build/bsps/powerpc/psim/bsppsim.yml b/spec/build/bsps/powerpc/psim/bsppsim.yml
index 29e4c41b5c..ac5648f72c 100644
--- a/spec/build/bsps/powerpc/psim/bsppsim.yml
+++ b/spec/build/bsps/powerpc/psim/bsppsim.yml
@@ -46,8 +46,6 @@ links:
   uid: objmpci
 - role: build-dependency
   uid: ../../objmem
-- role: build-dependency
-  uid: optclkfastidle
 - role: build-dependency
   uid: optsbrk
 - role: build-dependency
diff --git a/spec/build/bsps/powerpc/psim/optclkfastidle.yml b/spec/build/bsps/powerpc/psim/optclkfastidle.yml
deleted file mode 100644
index 1019af2630..0000000000
--- a/spec/build/bsps/powerpc/psim/optclkfastidle.yml
+++ /dev/null
@@ -1,18 +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 & Co. KG
-default:
-- enabled-by: powerpc/psim
-  value: true
-- enabled-by: true
-  value: false
-description: |
-  This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
-enabled-by: true
-links: []
-name: CLOCK_DRIVER_USE_FAST_IDLE
-type: build