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.

39 files changed, 123 insertions, 134 deletions

diff --git a/spec/build/bsps/aarch64/a53/abi.yml b/spec/build/bsps/aarch64/a53/abi.yml
index 6401972f76..4374818fbd 100644
--- a/spec/build/bsps/aarch64/a53/abi.yml
+++ b/spec/build/bsps/aarch64/a53/abi.yml
@@ -7,13 +7,13 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
-- -mcpu=cortex-a53
-default-by-variant:
-- value:
+- enabled-by: aarch64/a53_ilp32_qemu
+  value:
   - -mcpu=cortex-a53
   - -mabi=ilp32
-  variants:
-  - aarch64/a53_ilp32_qemu
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a53
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optloadoff.yml b/spec/build/bsps/aarch64/a53/optloadoff.yml
index bdd9856afc..efdc8a0d8b 100644
--- a/spec/build/bsps/aarch64/a53/optloadoff.yml
+++ b/spec/build/bsps/aarch64/a53/optloadoff.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00008000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00008000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optnocachelen.yml b/spec/build/bsps/aarch64/a53/optnocachelen.yml
index 8655f7a6dd..989354af2e 100644
--- a/spec/build/bsps/aarch64/a53/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/a53/optnocachelen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00100000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   length of nocache RAM region
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optramlen.yml b/spec/build/bsps/aarch64/a53/optramlen.yml
index 2d84831938..452587021f 100644
--- a/spec/build/bsps/aarch64/a53/optramlen.yml
+++ b/spec/build/bsps/aarch64/a53/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x08000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x08000000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optramori.yml b/spec/build/bsps/aarch64/a53/optramori.yml
index 9601637c0e..58e4ec0082 100644
--- a/spec/build/bsps/aarch64/a53/optramori.yml
+++ b/spec/build/bsps/aarch64/a53/optramori.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x40000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x40000000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/tsta53.yml b/spec/build/bsps/aarch64/a53/tsta53.yml
index c8a258acfe..a3d8c9810d 100644
--- a/spec/build/bsps/aarch64/a53/tsta53.yml
+++ b/spec/build/bsps/aarch64/a53/tsta53.yml
@@ -38,8 +38,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/a72/abi.yml b/spec/build/bsps/aarch64/a72/abi.yml
index 9b9438648c..994a3bbbe1 100644
--- a/spec/build/bsps/aarch64/a72/abi.yml
+++ b/spec/build/bsps/aarch64/a72/abi.yml
@@ -7,13 +7,13 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
-- -mcpu=cortex-a72
-default-by-variant:
-- value:
+- enabled-by: aarch64/a72_ilp32_qemu
+  value:
   - -mcpu=cortex-a72
   - -mabi=ilp32
-  variants:
-  - aarch64/a72_ilp32_qemu
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a72
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a72/optloadoff.yml b/spec/build/bsps/aarch64/a72/optloadoff.yml
index 6d068e4297..91ea7669f3 100644
--- a/spec/build/bsps/aarch64/a72/optloadoff.yml
+++ b/spec/build/bsps/aarch64/a72/optloadoff.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00008000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00008000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a72/optnocachelen.yml b/spec/build/bsps/aarch64/a72/optnocachelen.yml
index de4c4d5888..6b069f2d7e 100644
--- a/spec/build/bsps/aarch64/a72/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/a72/optnocachelen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00100000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   length of nocache RAM region
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a72/optramlen.yml b/spec/build/bsps/aarch64/a72/optramlen.yml
index d6cfe6ade8..5d1e1e5043 100644
--- a/spec/build/bsps/aarch64/a72/optramlen.yml
+++ b/spec/build/bsps/aarch64/a72/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x08000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x08000000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a72/optramori.yml b/spec/build/bsps/aarch64/a72/optramori.yml
index 5865fd604d..ec7e098fe4 100644
--- a/spec/build/bsps/aarch64/a72/optramori.yml
+++ b/spec/build/bsps/aarch64/a72/optramori.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x40000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x40000000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a72/tsta72.yml b/spec/build/bsps/aarch64/a72/tsta72.yml
index c8a258acfe..a3d8c9810d 100644
--- a/spec/build/bsps/aarch64/a72/tsta72.yml
+++ b/spec/build/bsps/aarch64/a72/tsta72.yml
@@ -38,8 +38,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/optgtuseps.yml b/spec/build/bsps/aarch64/optgtuseps.yml
index 3c85f08e17..9ce0cb7552 100644
--- a/spec/build/bsps/aarch64/optgtuseps.yml
+++ b/spec/build/bsps/aarch64/optgtuseps.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   If set to true, and AARCH64_GENERIC_TIMER_USE_VIRTUAL is false, then
   the clock driver uses the Physical Secure Timer of the AARCH64
diff --git a/spec/build/bsps/aarch64/optgtusevirt.yml b/spec/build/bsps/aarch64/optgtusevirt.yml
index 919eb86c32..b50e5b0490 100644
--- a/spec/build/bsps/aarch64/optgtusevirt.yml
+++ b/spec/build/bsps/aarch64/optgtusevirt.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   If set to true, then the clock driver uses the Virtual Timer of the AARCH64
   Generic Timer, otherwise it uses the Physical Non-Secure Timer (EL1).
diff --git a/spec/build/bsps/aarch64/optmmupages.yml b/spec/build/bsps/aarch64/optmmupages.yml
index 4dd4644130..a8460ca11d 100644
--- a/spec/build/bsps/aarch64/optmmupages.yml
+++ b/spec/build/bsps/aarch64/optmmupages.yml
@@ -8,8 +8,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 On-Line Applications Research (OAR)
-default: 0x00000040
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000040
 description: |
   Defines the number of MMU translation table pages to provide.
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/raspberrypi/abi.yml b/spec/build/bsps/aarch64/raspberrypi/abi.yml
index 60ce528dc4..949074f6b6 100644
--- a/spec/build/bsps/aarch64/raspberrypi/abi.yml
+++ b/spec/build/bsps/aarch64/raspberrypi/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2022 Mohd Noor Aman
 default:
-- -mcpu=cortex-a72
-- -march=armv8-a
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a72
+  - -march=armv8-a
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/abi.yml b/spec/build/bsps/aarch64/xilinx-versal/abi.yml
index b52df18fb3..9e7a59a7f4 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/abi.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom
 default:
-- -mcpu=cortex-a72
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a72
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml b/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml
index 3d567c961c..049bd0bd4a 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Chris Johns <chris@contemporary.software>
-default: 99999001
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 99999001
 description: |
   Versal i2c0 clock frequency in Hz. This is the frequency after the signal
   has been processed using the values passed to the I2C0_REF_CTRL register.
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml b/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml
index 4f67f3ee95..1fa3ebba93 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Chris Johns <chris@contemporary.software>
-default: 99999001
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 99999001
 description: |
   Versal i2c1 clock frequency in Hz. This is the frequency after the signal
   has been processed using the values passed to the I2C1_REF_CTRL register.
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml b/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml
index fb344019e2..2ea9ea636d 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: 100000000
-default-by-variant:
-- value: 24000000
-  variants:
-  - aarch64/xilinx_versal_qemu
+default:
+- enabled-by: aarch64/xilinx_versal_qemu
+  value: 24000000
+- enabled-by: true
+  value: 100000000
 description: |
   Versal UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml b/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml
index 24108512fc..00c5dbaebd 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 Chris Johns (chris@contemporary.software)
-default: true
-default-by-variant: []
+default:
+- enabled-by: true
+  value: true
 description: |
   use interrupt driven mode for console devices (used by default)
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml b/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml
index bb21e8fae7..39778e604f 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0
 description: |
   minor number of console device
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml
index 4a7fdc489e..27f7913fb4 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml
@@ -7,11 +7,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: 0x00000000
-default-by-variant:
-- value: 0x00008000
-  variants:
-  - aarch64/xilinx_versal_qemu
+default:
+- enabled-by: aarch64/xilinx_versal_qemu
+  value: 0x00008000
+- enabled-by: true
+  value: 0x00000000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml b/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml
index 73a57964e1..894a0b59e9 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: 0x00100000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   length of nocache RAM region
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml b/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml
index 95347fc7e3..b635f01502 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: 0x10000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x10000000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/optramori.yml b/spec/build/bsps/aarch64/xilinx-versal/optramori.yml
index 6e94f55b7e..110642becf 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/optramori.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/optramori.yml
@@ -7,11 +7,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: 0x10000000
-default-by-variant:
-- value: 0x20000000
-  variants:
-  - aarch64/xilinx_versal_qemu
+default:
+- enabled-by: aarch64/xilinx_versal_qemu
+  value: 0x20000000
+- enabled-by: true
+  value: 0x10000000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml b/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml
index b89c92e30a..0a0ab619af 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml
@@ -9,8 +9,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml b/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml
index b89c92e30a..0a0ab619af 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml
@@ -9,8 +9,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml b/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml
index b89c92e30a..0a0ab619af 100644
--- a/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml
+++ b/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml
@@ -9,8 +9,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org>
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
index 59b5f922d4..8f514ca791 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
@@ -7,16 +7,17 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
-- -mcpu=cortex-a53
-- -mno-outline-atomics
-default-by-variant:
-- value:
+- enabled-by:
+  - aarch64/xilinx_zynqmp_ilp32_qemu
+  - aarch64/xilinx_zynqmp_ilp32_zu3eg
+  value:
   - -mcpu=cortex-a53
   - -mno-outline-atomics
   - -mabi=ilp32
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a53
+  - -mno-outline-atomics
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml
index 1005594abe..c3793e9aae 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml
@@ -6,20 +6,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 On-Line Applications Research (OAR)
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 111111111
-default-by-variant:
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+default:
+- enabled-by: true
+  value: 111111111
 description: |
   ZynqMP i2c0 clock frequency in Hz. This is the frequency after the signal
   has been processed using the values passed to the I2C0_REF_CTRL register.
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml
index f1b26578e0..12974d2694 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml
@@ -6,20 +6,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 On-Line Applications Research (OAR)
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 111111111
-default-by-variant:
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+default:
+- enabled-by: true
+  value: 111111111
 description: |
   ZynqMP i2c1 clock frequency in Hz. This is the frequency after the signal
   has been processed using the values passed to the I2C1_REF_CTRL register.
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml
index 24f232e711..5cec0d2188 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml
@@ -5,15 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 100000000
-default-by-variant:
-- value: 100000000
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-  - aarch64/xilinx_zynqmp_lp64_cfc400x
-  - aarch64/xilinx_zynqmp_lp64_qemu
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+default:
+- enabled-by: true
+  value: 100000000
 description: |
   Zynq UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
index 3e89085eb3..869181a95e 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
@@ -7,13 +7,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00008000
-default-by-variant:
-- value: 0x00000000
-  variants:
+default:
+- enabled-by:
   - aarch64/xilinx_zynqmp_ilp32_zu3eg
   - aarch64/xilinx_zynqmp_lp64_cfc400x
   - aarch64/xilinx_zynqmp_lp64_zu3eg
+  value: 0x00000000
+- enabled-by: true
+  value: 0x00008000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml
index 3164c7b63d..68aa5dc9ab 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00100000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   length of nocache RAM region
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml
index 4599773985..9f488afd10 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x10000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x10000000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
index c67358f0d5..c4d33094fb 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
@@ -7,13 +7,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x40018000
-default-by-variant:
-- value: 0x10000000
-  variants:
+default:
+- enabled-by:
   - aarch64/xilinx_zynqmp_ilp32_zu3eg
   - aarch64/xilinx_zynqmp_lp64_cfc400x
   - aarch64/xilinx_zynqmp_lp64_zu3eg
+  value: 0x10000000
+- enabled-by: true
+  value: 0x40018000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
index c8a258acfe..a3d8c9810d 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
@@ -38,8 +38,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
index 894819cd01..15cb9697ed 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
@@ -9,8 +9,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []