build: Use enabled by for defaults

Merge the "default" and "default-by-variant" attributes.  Use an
"enabled-by" expression to select the default value based on the enabled
set.  This makes it possible to select default values depending on other
options.  For example you could choose memory settings based on whether
RTEMS_SMP is enabled or disabled.

The change was tested by comparing the output of

  ./waf bspdefaults

before and after the change.

44 files changed, 205 insertions, 177 deletions

diff --git a/spec/build/bsps/arm/stm32h7/abi.yml b/spec/build/bsps/arm/stm32h7/abi.yml
index 27da264d03..2289c595bf 100644
--- a/spec/build/bsps/arm/stm32h7/abi.yml
+++ b/spec/build/bsps/arm/stm32h7/abi.yml
@@ -7,19 +7,20 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mthumb
-- -mcpu=cortex-m7
-- -mfpu=fpv5-d16
-- -mfloat-abi=hard
-default-by-variant:
-- value:
+- enabled-by:
+  - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval-m4
+  value:
   - -mthumb
   - -mcpu=cortex-m4
   - -mfpu=fpv4-sp-d16
   - -mfloat-abi=hard
-  variants:
-  - arm/stm32h747i-disco-m4
-  - arm/stm32h757i-eval-m4
+- enabled-by: true
+  value:
+  - -mthumb
+  - -mcpu=cortex-m7
+  - -mfpu=fpv5-d16
+  - -mfloat-abi=hard
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optbootcore.yml b/spec/build/bsps/arm/stm32h7/optbootcore.yml
index c248939bbe..1aa3cbd8e4 100644
--- a/spec/build/bsps/arm/stm32h7/optbootcore.yml
+++ b/spec/build/bsps/arm/stm32h7/optbootcore.yml
@@ -9,16 +9,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Karel Gardas <karel@functional.vision>
-default: BOOT_CORE_DEFINE_NOT_NEEDED
-default-by-variant:
-- value: CORE_CM7
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h757i-eval
-- value: CORE_CM4
-  variants:
+  value: CORE_CM7
+- enabled-by:
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval-m4
+  value: CORE_CM4
+- enabled-by: true
+  value: BOOT_CORE_DEFINE_NOT_NEEDED
 description: |
   Select the boot core. Possible values are CORE_CM7 and CORE_CM4
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenmpualign.yml b/spec/build/bsps/arm/stm32h7/optenmpualign.yml
index 407a824b36..f7fe5447e4 100644
--- a/spec/build/bsps/arm/stm32h7/optenmpualign.yml
+++ b/spec/build/bsps/arm/stm32h7/optenmpualign.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant: []
+default:
+- enabled-by: true
+  value: true
 description: |
   Enable the alignment of the size of the combined start and text sections and
   the rodata section to meet MPU region alignment requirements.  This increases
diff --git a/spec/build/bsps/arm/stm32h7/optenuart4.yml b/spec/build/bsps/arm/stm32h7/optenuart4.yml
index b95b2372f7..e3d8a43b2b 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart4.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart4.yml
@@ -5,14 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable UART4 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart5.yml b/spec/build/bsps/arm/stm32h7/optenuart5.yml
index db70f25470..6f116c4f8f 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart5.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart5.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable UART5 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart7.yml b/spec/build/bsps/arm/stm32h7/optenuart7.yml
index 6fdc57cec8..42a425ae1d 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart7.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart7.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable UART7 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart8.yml b/spec/build/bsps/arm/stm32h7/optenuart8.yml
index 0dc550d701..b933a291dd 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart8.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart8.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable UART8 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart9.yml b/spec/build/bsps/arm/stm32h7/optenuart9.yml
index 9c364b7fec..78354328ae 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart9.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart9.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable UART9 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart1.yml b/spec/build/bsps/arm/stm32h7/optenusart1.yml
index 2ed54158b3..6707415008 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart1.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart1.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant: []
+default:
+- enabled-by: true
+  value: true
 description: |
   Enable USART1 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart10.yml b/spec/build/bsps/arm/stm32h7/optenusart10.yml
index a23ce86e7e..3822b0af78 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart10.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart10.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable USART10 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart2.yml b/spec/build/bsps/arm/stm32h7/optenusart2.yml
index 482b31e794..1156853139 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart2.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart2.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable USART2 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart3.yml b/spec/build/bsps/arm/stm32h7/optenusart3.yml
index 48f5ce7e9f..0b4adad549 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart3.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart3.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable USART3 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart6.yml b/spec/build/bsps/arm/stm32h7/optenusart6.yml
index 1090bbce39..a1efb0dc80 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart6.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart6.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: false
+- enabled-by: true
+  value: true
 description: |
   Enable USART6 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optethgpiobregs.yml b/spec/build/bsps/arm/stm32h7/optethgpiobregs.yml
index 168e235719..aae049fa2d 100644
--- a/spec/build/bsps/arm/stm32h7/optethgpiobregs.yml
+++ b/spec/build/bsps/arm/stm32h7/optethgpiobregs.yml
@@ -5,11 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: GPIO_PIN_13
-  variants:
-  - arm/nucleo-h743zi
+default:
+- enabled-by: arm/nucleo-h743zi
+  value: GPIO_PIN_13
 description: |
   GPIO B pins used for the ETH pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optethgpiogregs.yml b/spec/build/bsps/arm/stm32h7/optethgpiogregs.yml
index 74a4286310..7c6ac690f1 100644
--- a/spec/build/bsps/arm/stm32h7/optethgpiogregs.yml
+++ b/spec/build/bsps/arm/stm32h7/optethgpiogregs.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: ( GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13 )
-default-by-variant:
-- value: ( GPIO_PIN_2 | GPIO_PIN_11 | GPIO_PIN_13 )
-  variants:
-  - arm/nucleo-h743zi
+default:
+- enabled-by: arm/nucleo-h743zi
+  value: ( GPIO_PIN_2 | GPIO_PIN_11 | GPIO_PIN_13 )
+- enabled-by: true
+  value: ( GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13 )
 description: |
   GPIO G pins used for the ETH pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/opthse.yml b/spec/build/bsps/arm/stm32h7/opthse.yml
index debccdc686..336575638a 100644
--- a/spec/build/bsps/arm/stm32h7/opthse.yml
+++ b/spec/build/bsps/arm/stm32h7/opthse.yml
@@ -6,14 +6,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: 25000000
-default-by-variant:
-- value: 8000000
-  variants:
-  - arm/nucleo-h743zi
-- value: 24000000
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/nucleo-h743zi
+  value: 8000000
+- enabled-by: arm/stm32h7b3i-dk
+  value: 24000000
+- enabled-by: true
+  value: 25000000
 description: |
   Frequency of the external high speed oscillator (HSE).
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optlinkcmds.yml b/spec/build/bsps/arm/stm32h7/optlinkcmds.yml
index ed10fe94d1..d558c519cb 100644
--- a/spec/build/bsps/arm/stm32h7/optlinkcmds.yml
+++ b/spec/build/bsps/arm/stm32h7/optlinkcmds.yml
@@ -5,16 +5,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: linkcmds.sdram
-default-by-variant:
-- value: linkcmds.flash
-  variants:
+default:
+- enabled-by:
   - arm/nucleo-h743zi
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: linkcmds.flash
+- enabled-by: true
+  value: linkcmds.sdram
 description: |
   The default linker command file.  Must be either linkcmds.flash,
   linkcmds.sdram, linkcmds.sram, linkcmds.sram_sdram
diff --git a/spec/build/bsps/arm/stm32h7/optmemdtcmsz.yml b/spec/build/bsps/arm/stm32h7/optmemdtcmsz.yml
index e62efb45c2..260cc14a97 100644
--- a/spec/build/bsps/arm/stm32h7/optmemdtcmsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemdtcmsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00020000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00020000
 description: |
   Size of the Data Tightly Coupled Memory (DTCM) in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemflashlatency.yml b/spec/build/bsps/arm/stm32h7/optmemflashlatency.yml
index 0f0c673ee8..facee637dc 100644
--- a/spec/build/bsps/arm/stm32h7/optmemflashlatency.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemflashlatency.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Karel Gardas <karel@functional.vision>
-default: FLASH_LATENCY_4
-default-by-variant:
-- value: FLASH_LATENCY_6
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: FLASH_LATENCY_6
+- enabled-by: true
+  value: FLASH_LATENCY_4
 description: |
   Internal Flash latency
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml b/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml
index 2e97ba5659..828b5e6ba2 100644
--- a/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x08000000
-default-by-variant:
-- value: 0x08100000
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval-m4
+  value: 0x08100000
+- enabled-by: true
+  value: 0x08000000
 description: |
   Origin address of the internal flash.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemflashsz.yml b/spec/build/bsps/arm/stm32h7/optmemflashsz.yml
index c8eb11f320..8dcfa76e4f 100644
--- a/spec/build/bsps/arm/stm32h7/optmemflashsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemflashsz.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00200000
-default-by-variant:
-- value: 0x00100000
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval-m4
+  value: 0x00100000
+- enabled-by: true
+  value: 0x00200000
 description: |
   Size of the internal flash in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemitcmsz.yml b/spec/build/bsps/arm/stm32h7/optmemitcmsz.yml
index 1648eebb40..e9dcac542d 100644
--- a/spec/build/bsps/arm/stm32h7/optmemitcmsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemitcmsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x0000ff00
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x0000ff00
 description: |
   Size of the Instruction Tightly Coupled Memory (ITCM) in bytes.  The size
   must take the NULL pointer protection memory area into account
diff --git a/spec/build/bsps/arm/stm32h7/optmemnandsz.yml b/spec/build/bsps/arm/stm32h7/optmemnandsz.yml
index 9c53510cd7..cad32b132d 100644
--- a/spec/build/bsps/arm/stm32h7/optmemnandsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemnandsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of the NAND flash in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemnorsz.yml b/spec/build/bsps/arm/stm32h7/optmemnorsz.yml
index 4449924a72..133663b3ae 100644
--- a/spec/build/bsps/arm/stm32h7/optmemnorsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemnorsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of the NOR flash or PSRAM in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemnullsz.yml b/spec/build/bsps/arm/stm32h7/optmemnullsz.yml
index feb8ba3be8..7a9d025fc4 100644
--- a/spec/build/bsps/arm/stm32h7/optmemnullsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemnullsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000100
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000100
 description: |
   Size of the NULL pointer protection area in bytes.  This memory area reduces
   the size of the ITCM available to the application (STM32H7_MEMORY_ITCM_SIZE).
diff --git a/spec/build/bsps/arm/stm32h7/optmemperipheralsz.yml b/spec/build/bsps/arm/stm32h7/optmemperipheralsz.yml
index 75a3aa0f3b..6fa49af466 100644
--- a/spec/build/bsps/arm/stm32h7/optmemperipheralsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemperipheralsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x20000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x20000000
 description: |
   Size of the peripheral memory in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemquadspisz.yml b/spec/build/bsps/arm/stm32h7/optmemquadspisz.yml
index 4fd966e63a..82c48c7683 100644
--- a/spec/build/bsps/arm/stm32h7/optmemquadspisz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemquadspisz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of the QUADSPI memory in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml b/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml
index 0a554d1461..7b93747a41 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml
@@ -5,16 +5,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x02000000
-default-by-variant:
-- value: 0x00000000
-  variants:
+default:
+- enabled-by:
   - arm/nucleo-h743zi
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: 0x00000000
+- enabled-by: true
+  value: 0x02000000
 description: |
   Size of the SDRAM 1 in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml b/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml
index ccd026fc4e..addff5fa58 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml
@@ -5,14 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x02000000
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
+  value: 0x02000000
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of the SDRAM 2 in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsram1sz.yml b/spec/build/bsps/arm/stm32h7/optmemsram1sz.yml
index a624a8a76c..a3ecbadd3f 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsram1sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsram1sz.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00020000
-default-by-variant:
-- value: 0x00010000
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: 0x00010000
+- enabled-by: true
+  value: 0x00020000
 description: |
   Size of the SRAM 1 (D2 domain) in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsram2sz.yml b/spec/build/bsps/arm/stm32h7/optmemsram2sz.yml
index 47cbbfe770..851b5f5632 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsram2sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsram2sz.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00020000
-default-by-variant:
-- value: 0x00010000
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: 0x00010000
+- enabled-by: true
+  value: 0x00020000
 description: |
   Size of the SRAM 2 (D2 domain) in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsram3sz.yml b/spec/build/bsps/arm/stm32h7/optmemsram3sz.yml
index dddc15d304..23b7353313 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsram3sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsram3sz.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00008000
-default-by-variant:
-- value: 0x00000000
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: 0x00000000
+- enabled-by: true
+  value: 0x00008000
 description: |
   Size of the SRAM 3 (D2 domain) in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsram4sz.yml b/spec/build/bsps/arm/stm32h7/optmemsram4sz.yml
index 3f89188adc..3b777a4943 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsram4sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsram4sz.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00010000
-default-by-variant:
-- value: 0x00008000
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: 0x00008000
+- enabled-by: true
+  value: 0x00010000
 description: |
   Size of the SRAM 4 (D3 domain) in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsramaxisz.yml b/spec/build/bsps/arm/stm32h7/optmemsramaxisz.yml
index 24964196a1..79787c4e64 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsramaxisz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsramaxisz.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00080000
-default-by-variant:
-- value: 0x000a0000
-  variants:
-  - arm/stm32h7b3i-dk
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: 0x000a0000
+- enabled-by: true
+  value: 0x00080000
 description: |
   Size of the AXI SRAM (D1 domain) in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsrambackupsz.yml b/spec/build/bsps/arm/stm32h7/optmemsrambackupsz.yml
index 40e3ae1a1d..0d22f2aafb 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsrambackupsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsrambackupsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00001000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00001000
 description: |
   Size of backup SRAM in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optprintkinstance.yml b/spec/build/bsps/arm/stm32h7/optprintkinstance.yml
index 16c1b4238b..be5d14e05b 100644
--- a/spec/build/bsps/arm/stm32h7/optprintkinstance.yml
+++ b/spec/build/bsps/arm/stm32h7/optprintkinstance.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: stm32h7_usart1_instance
-default-by-variant:
-- value: stm32h7_usart3_instance
-  variants:
-  - arm/nucleo-h743zi
+default:
+- enabled-by: arm/nucleo-h743zi
+  value: stm32h7_usart3_instance
+- enabled-by: true
+  value: stm32h7_usart1_instance
 description: |
   UART/USART instance used for printk() and getchark().
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optpwrsupply.yml b/spec/build/bsps/arm/stm32h7/optpwrsupply.yml
index 6534cf6143..2fec330314 100644
--- a/spec/build/bsps/arm/stm32h7/optpwrsupply.yml
+++ b/spec/build/bsps/arm/stm32h7/optpwrsupply.yml
@@ -5,15 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Karel Gardas <karel@functional.vision>
-default: PWR_LDO_SUPPLY
-default-by-variant:
-- value: PWR_DIRECT_SMPS_SUPPLY
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
   - arm/stm32h7b3i-dk
+  value: PWR_DIRECT_SMPS_SUPPLY
+- enabled-by: true
+  value: PWR_LDO_SUPPLY
 description: |
   Board power supply mechanism configuration. WARNING: wrong configuration here
   may result in your board being unaccessible using ST-Link interface! Please
diff --git a/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml b/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml
index e0f39814e8..b4b2b6b774 100644
--- a/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Karel Gardas <karel@functional.vision>
-default: GPIO_AF4_USART1
-default-by-variant:
-- value: GPIO_AF7_USART1
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h7b3i-dk
+  value: GPIO_AF7_USART1
+- enabled-by: true
+  value: GPIO_AF4_USART1
 description: |
   Alternate function mapping for the USART1 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml b/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml
index cc81ce408b..219e9705f7 100644
--- a/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021-22 embedded brains GmbH (http://www.embedded-brains.de)
-default: ( GPIO_PIN_14 | GPIO_PIN_15 )
-default-by-variant:
-- value: ( GPIO_PIN_9 | GPIO_PIN_10 )
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h7b3i-dk
+  value: ( GPIO_PIN_9 | GPIO_PIN_10 )
+- enabled-by: true
+  value: ( GPIO_PIN_14 | GPIO_PIN_15 )
 description: |
   GPIO pins used for the USART1 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml b/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml
index 890579b9f8..f9de4981e6 100644
--- a/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml
@@ -5,17 +5,18 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: GPIOD
-default-by-variant:
-- value: GPIOA
-  variants:
+default:
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
   - arm/stm32h7b3i-dk
-- value: GPIOB
-  variants:
+  value: GPIOA
+- enabled-by:
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
+  value: GPIOB
+- enabled-by: true
+  value: GPIOD
 description: |
   GPIO registers used for the USART1 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optusart3gpiopins.yml b/spec/build/bsps/arm/stm32h7/optusart3gpiopins.yml
index f946bbd2a6..25339aefbb 100644
--- a/spec/build/bsps/arm/stm32h7/optusart3gpiopins.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart3gpiopins.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: ( GPIO_PIN_8 | GPIO_PIN_9 )
-default-by-variant: []
+default:
+- enabled-by: true
+  value: ( GPIO_PIN_8 | GPIO_PIN_9 )
 description: |
   GPIO pins used for the USART3 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optusart3gpioregs.yml b/spec/build/bsps/arm/stm32h7/optusart3gpioregs.yml
index 3485b4fdb8..f227c5cfdf 100644
--- a/spec/build/bsps/arm/stm32h7/optusart3gpioregs.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart3gpioregs.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: GPIOD
-default-by-variant: []
+default:
+- enabled-by: true
+  value: GPIOD
 description: |
   GPIO registers used for the USART3 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optvariant.yml b/spec/build/bsps/arm/stm32h7/optvariant.yml
index c5c0ce65dc..e6324c644d 100644
--- a/spec/build/bsps/arm/stm32h7/optvariant.yml
+++ b/spec/build/bsps/arm/stm32h7/optvariant.yml
@@ -15,19 +15,19 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: STM32H743xx
-default-by-variant:
-- value: STM32H7B3xxQ
-  variants:
-  - arm/stm32h7b3i-dk
-- value: STM32H757xx
-  variants:
+default:
+- enabled-by: arm/stm32h7b3i-dk
+  value: STM32H7B3xxQ
+- enabled-by:
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
-- value: STM32H747xx
-  variants:
+  value: STM32H757xx
+- enabled-by:
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  value: STM32H747xx
+- enabled-by: true
+  value: STM32H743xx
 description: |
   Select the STM32H7 series chip variant out of STM32H742xx, STM32H743xx,
   STM32H745xx, STM32H747xx, STM32H750xx, STM32H753xx, STM32H755xx, STM32H757xx,
diff --git a/spec/build/bsps/arm/stm32h7/tststm32h757i-eval.yml b/spec/build/bsps/arm/stm32h7/tststm32h757i-eval.yml
index 69f7ffe561..0b08f39fd5 100644
--- a/spec/build/bsps/arm/stm32h7/tststm32h757i-eval.yml
+++ b/spec/build/bsps/arm/stm32h7/tststm32h757i-eval.yml
@@ -10,8 +10,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: