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.

66 files changed, 130 insertions, 153 deletions

diff --git a/spec/build/cpukit/cfgattrgetaff.yml b/spec/build/cpukit/cfgattrgetaff.yml
index d909a7ad81..a7985bcf9a 100644
--- a/spec/build/cpukit/cfgattrgetaff.yml
+++ b/spec/build/cpukit/cfgattrgetaff.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgattrgetgrdsz.yml b/spec/build/cpukit/cfgattrgetgrdsz.yml
index e25c7d7d32..3c97140e8d 100644
--- a/spec/build/cpukit/cfgattrgetgrdsz.yml
+++ b/spec/build/cpukit/cfgattrgetgrdsz.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgattrgetstack.yml b/spec/build/cpukit/cfgattrgetstack.yml
index f0ac46a3c0..6de858cfd1 100644
--- a/spec/build/cpukit/cfgattrgetstack.yml
+++ b/spec/build/cpukit/cfgattrgetstack.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgattrsetaff.yml b/spec/build/cpukit/cfgattrsetaff.yml
index 9da99651df..3b53dffc53 100644
--- a/spec/build/cpukit/cfgattrsetaff.yml
+++ b/spec/build/cpukit/cfgattrsetaff.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgattrsetgrdsz.yml b/spec/build/cpukit/cfgattrsetgrdsz.yml
index 7f2108a54e..3232f4e693 100644
--- a/spec/build/cpukit/cfgattrsetgrdsz.yml
+++ b/spec/build/cpukit/cfgattrsetgrdsz.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgattrsetstack.yml b/spec/build/cpukit/cfgattrsetstack.yml
index 6e5e8e1674..e9bad78da8 100644
--- a/spec/build/cpukit/cfgattrsetstack.yml
+++ b/spec/build/cpukit/cfgattrsetstack.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgcfghdr.yml b/spec/build/cpukit/cfgcfghdr.yml
index efcf15ffd6..a5f9441559 100644
--- a/spec/build/cpukit/cfgcfghdr.yml
+++ b/spec/build/cpukit/cfgcfghdr.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgcleanupctx.yml b/spec/build/cpukit/cfgcleanupctx.yml
index 3f0d1a8e67..e4b4efcf17 100644
--- a/spec/build/cpukit/cfgcleanupctx.yml
+++ b/spec/build/cpukit/cfgcleanupctx.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfggetaff.yml b/spec/build/cpukit/cfggetaff.yml
index b8c8f1ab06..d77cf04cb9 100644
--- a/spec/build/cpukit/cfggetaff.yml
+++ b/spec/build/cpukit/cfggetaff.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfggetattr.yml b/spec/build/cpukit/cfggetattr.yml
index fcfc3bcedc..aa49f1839c 100644
--- a/spec/build/cpukit/cfggetattr.yml
+++ b/spec/build/cpukit/cfggetattr.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfginttypes.yml b/spec/build/cpukit/cfginttypes.yml
index baa25af685..57c308c71b 100644
--- a/spec/build/cpukit/cfginttypes.yml
+++ b/spec/build/cpukit/cfginttypes.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgmemory.yml b/spec/build/cpukit/cfgmemory.yml
index 633d98d0cc..60807483d8 100644
--- a/spec/build/cpukit/cfgmemory.yml
+++ b/spec/build/cpukit/cfgmemory.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgnewlib.yml b/spec/build/cpukit/cfgnewlib.yml
index d2ebadc808..1f80e39682 100644
--- a/spec/build/cpukit/cfgnewlib.yml
+++ b/spec/build/cpukit/cfgnewlib.yml
@@ -5,8 +5,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: RTEMS_NEWLIB
 links: []
diff --git a/spec/build/cpukit/cfgpmtxceilcnst.yml b/spec/build/cpukit/cfgpmtxceilcnst.yml
index 0baff35782..8aede1a3b6 100644
--- a/spec/build/cpukit/cfgpmtxceilcnst.yml
+++ b/spec/build/cpukit/cfgpmtxceilcnst.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgprionode.yml b/spec/build/cpukit/cfgprionode.yml
index e26ce4d970..a1864b1657 100644
--- a/spec/build/cpukit/cfgprionode.yml
+++ b/spec/build/cpukit/cfgprionode.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgpshdprmcnst.yml b/spec/build/cpukit/cfgpshdprmcnst.yml
index 04fa53d142..f3d077e035 100644
--- a/spec/build/cpukit/cfgpshdprmcnst.yml
+++ b/spec/build/cpukit/cfgpshdprmcnst.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgrcmd.yml b/spec/build/cpukit/cfgrcmd.yml
index f65980cbbb..8d1027f15a 100644
--- a/spec/build/cpukit/cfgrcmd.yml
+++ b/spec/build/cpukit/cfgrcmd.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgsetaff.yml b/spec/build/cpukit/cfgsetaff.yml
index 04a5f48e2c..c14b35102b 100644
--- a/spec/build/cpukit/cfgsetaff.yml
+++ b/spec/build/cpukit/cfgsetaff.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgstdatomic.yml b/spec/build/cpukit/cfgstdatomic.yml
index caa724a85e..970364588d 100644
--- a/spec/build/cpukit/cfgstdatomic.yml
+++ b/spec/build/cpukit/cfgstdatomic.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgstdint.yml b/spec/build/cpukit/cfgstdint.yml
index da6ee92d36..6ea9d0ab1c 100644
--- a/spec/build/cpukit/cfgstdint.yml
+++ b/spec/build/cpukit/cfgstdint.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgstdlib.yml b/spec/build/cpukit/cfgstdlib.yml
index 70ba02ab58..be849739d2 100644
--- a/spec/build/cpukit/cfgstdlib.yml
+++ b/spec/build/cpukit/cfgstdlib.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgstring.yml b/spec/build/cpukit/cfgstring.yml
index ebd444d539..2e75a94bbe 100644
--- a/spec/build/cpukit/cfgstring.yml
+++ b/spec/build/cpukit/cfgstring.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgstrings.yml b/spec/build/cpukit/cfgstrings.yml
index 4d202d90c9..6c847334ab 100644
--- a/spec/build/cpukit/cfgstrings.yml
+++ b/spec/build/cpukit/cfgstrings.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgsysstat.yml b/spec/build/cpukit/cfgsysstat.yml
index 394618ff71..a7a9806994 100644
--- a/spec/build/cpukit/cfgsysstat.yml
+++ b/spec/build/cpukit/cfgsysstat.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgsystypes.yml b/spec/build/cpukit/cfgsystypes.yml
index 89494a4edc..5f966f9975 100644
--- a/spec/build/cpukit/cfgsystypes.yml
+++ b/spec/build/cpukit/cfgsystypes.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgszoff.yml b/spec/build/cpukit/cfgszoff.yml
index edd8861d2e..7698c1d7cb 100644
--- a/spec/build/cpukit/cfgszoff.yml
+++ b/spec/build/cpukit/cfgszoff.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/cfgszsize.yml b/spec/build/cpukit/cfgszsize.yml
index 84926d8e70..190ca79238 100644
--- a/spec/build/cpukit/cfgszsize.yml
+++ b/spec/build/cpukit/cfgszsize.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/cfgsztime.yml b/spec/build/cpukit/cfgsztime.yml
index 449eee7699..204aabc1c7 100644
--- a/spec/build/cpukit/cfgsztime.yml
+++ b/spec/build/cpukit/cfgsztime.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/cfgunistd.yml b/spec/build/cpukit/cfgunistd.yml
index c48ea77b8e..76b710d523 100644
--- a/spec/build/cpukit/cfgunistd.yml
+++ b/spec/build/cpukit/cfgunistd.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/optada.yml b/spec/build/cpukit/optada.yml
index df3111feaa..24b47ee8e3 100644
--- a/spec/build/cpukit/optada.yml
+++ b/spec/build/cpukit/optada.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the Ada support
 enabled-by: true
diff --git a/spec/build/cpukit/optarchbits.yml b/spec/build/cpukit/optarchbits.yml
index ba8d52aa61..c10a1a1d62 100644
--- a/spec/build/cpukit/optarchbits.yml
+++ b/spec/build/cpukit/optarchbits.yml
@@ -6,11 +6,8 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
-default: ''
-default-by-variant:
-- value:
-  - '64'
-  variants:
+default:
+- enabled-by:
   - riscv/mpfs64imafdc
   - riscv/noel64imac
   - riscv/noel64imafd
@@ -18,9 +15,9 @@ default-by-variant:
   - riscv/rv64imac
   - riscv/rv64imafd
   - riscv/rv64imafdc
-- value:
-  - '32'
-  variants:
+  value:
+  - '64'
+- enabled-by:
   - riscv/griscv
   - riscv/noel32im
   - riscv/noel32imafd
@@ -31,6 +28,10 @@ default-by-variant:
   - riscv/rv32imafc
   - riscv/rv32imafd
   - riscv/rv32imafdc
+  value:
+  - '32'
+- enabled-by: true
+  value: ''
 description: The architecture word bits for the clang target triple.
 enabled-by:
 - and:
diff --git a/spec/build/cpukit/optarflags.yml b/spec/build/cpukit/optarflags.yml
index 52a55544c2..ccc582ea1b 100644
--- a/spec/build/cpukit/optarflags.yml
+++ b/spec/build/cpukit/optarflags.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- crD
-default-by-variant: []
+- enabled-by: true
+  value:
+  - crD
 description: |
   Flags passed to the library archiver
 enabled-by: true
diff --git a/spec/build/cpukit/optboothartid.yml b/spec/build/cpukit/optboothartid.yml
index e23154d4b4..90d37a8ec5 100644
--- a/spec/build/cpukit/optboothartid.yml
+++ b/spec/build/cpukit/optboothartid.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 1
-  variants:
-  - riscv/mpfs64imafdc
+default:
+- enabled-by: riscv/mpfs64imafdc
+  value: 1
+- enabled-by: true
+  value: 0
 description: |
   boot hartid (processor number) of risc-v cpu (default 0)
 enabled-by: riscv
diff --git a/spec/build/cpukit/optbuildlabel.yml b/spec/build/cpukit/optbuildlabel.yml
index f039089622..36c04a7220 100644
--- a/spec/build/cpukit/optbuildlabel.yml
+++ b/spec/build/cpukit/optbuildlabel.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: DEFAULT
-default-by-variant: []
+default:
+- enabled-by: true
+  value: DEFAULT
 description: |
   Defines the build label returned by rtems_get_build_label().
 enabled-by: true
diff --git a/spec/build/cpukit/optclang.yml b/spec/build/cpukit/optclang.yml
index 3eaf1fed87..612eaaaedb 100644
--- a/spec/build/cpukit/optclang.yml
+++ b/spec/build/cpukit/optclang.yml
@@ -35,8 +35,7 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by:
 - clang
diff --git a/spec/build/cpukit/optcoverage.yml b/spec/build/cpukit/optcoverage.yml
index 7c7013fe43..9d5d8ff0eb 100644
--- a/spec/build/cpukit/optcoverage.yml
+++ b/spec/build/cpukit/optcoverage.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2022 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the code and branch coverage support.
 enabled-by: true
diff --git a/spec/build/cpukit/optcoveragecflags.yml b/spec/build/cpukit/optcoveragecflags.yml
index 08cc79eb6c..81aa7bcdd6 100644
--- a/spec/build/cpukit/optcoveragecflags.yml
+++ b/spec/build/cpukit/optcoveragecflags.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- --coverage
-- -fprofile-info-section=.rtemsroset.gcov_info.content
-- -fprofile-update=atomic
-default-by-variant: []
+- enabled-by: true
+  value:
+  - --coverage
+  - -fprofile-info-section=.rtemsroset.gcov_info.content
+  - -fprofile-update=atomic
 description: |
   Compiler flags recommended for components which should generate coverage
   information.
diff --git a/spec/build/cpukit/optcoverageldflags.yml b/spec/build/cpukit/optcoverageldflags.yml
index 600c89e770..a45081a1c7 100644
--- a/spec/build/cpukit/optcoverageldflags.yml
+++ b/spec/build/cpukit/optcoverageldflags.yml
@@ -7,15 +7,16 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -Wl,--wrap=_CPU_Fatal_halt
-- -Wl,--wrap=bsp_reset
-- -Wl,--start-group
-- -lrtemsbsp
-- -lrtemscpu
-- -lrtemstest
-- -lgcov
-- -Wl,--end-group
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Wl,--wrap=_CPU_Fatal_halt
+  - -Wl,--wrap=bsp_reset
+  - -Wl,--start-group
+  - -lrtemsbsp
+  - -lrtemscpu
+  - -lrtemstest
+  - -lgcov
+  - -Wl,--end-group
 description: |
   Linker flags recommended for executables which contain modules with coverage
   information.
diff --git a/spec/build/cpukit/optdebug.yml b/spec/build/cpukit/optdebug.yml
index 2c976a2f49..4cdc2a5060 100644
--- a/spec/build/cpukit/optdebug.yml
+++ b/spec/build/cpukit/optdebug.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the RTEMS internal debug support
 enabled-by: true
diff --git a/spec/build/cpukit/optdrvmgr.yml b/spec/build/cpukit/optdrvmgr.yml
index f39313704c..dbee1b5648 100644
--- a/spec/build/cpukit/optdrvmgr.yml
+++ b/spec/build/cpukit/optdrvmgr.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the Driver Manager startup
 enabled-by: true
diff --git a/spec/build/cpukit/optexceptionextensions.yml b/spec/build/cpukit/optexceptionextensions.yml
index d1c815776d..a9a9bb735c 100644
--- a/spec/build/cpukit/optexceptionextensions.yml
+++ b/spec/build/cpukit/optexceptionextensions.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 On-Line Applications Research (OAR)
-default: true
-default-by-variant: []
+default:
+- enabled-by: true
+  value: true
 description: |
   Enable the RTEMS Exception Extensions for manipulating and acting on exception
   frames.
diff --git a/spec/build/cpukit/optgcc.yml b/spec/build/cpukit/optgcc.yml
index 1e72232700..664907e062 100644
--- a/spec/build/cpukit/optgcc.yml
+++ b/spec/build/cpukit/optgcc.yml
@@ -30,8 +30,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:
 - gcc
diff --git a/spec/build/cpukit/optincludes.yml b/spec/build/cpukit/optincludes.yml
index dffd71eba8..4384afc05d 100644
--- a/spec/build/cpukit/optincludes.yml
+++ b/spec/build/cpukit/optincludes.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/optinstall.yml b/spec/build/cpukit/optinstall.yml
index 6b39f95e85..a3bf35e377 100644
--- a/spec/build/cpukit/optinstall.yml
+++ b/spec/build/cpukit/optinstall.yml
@@ -12,8 +12,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: []
diff --git a/spec/build/cpukit/optlibdebugger.yml b/spec/build/cpukit/optlibdebugger.yml
index c657db4ba4..4cee9809f6 100644
--- a/spec/build/cpukit/optlibdebugger.yml
+++ b/spec/build/cpukit/optlibdebugger.yml
@@ -5,8 +5,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 Chris Johns (chrisj@rtems.org)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by:
 - aarch64
diff --git a/spec/build/cpukit/optlibdl.yml b/spec/build/cpukit/optlibdl.yml
index a3269c68ea..394370db0f 100644
--- a/spec/build/cpukit/optlibdl.yml
+++ b/spec/build/cpukit/optlibdl.yml
@@ -5,8 +5,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:
 - aarch64
diff --git a/spec/build/cpukit/optmpci.yml b/spec/build/cpukit/optmpci.yml
index 8cac36c4d3..fdab768ea6 100644
--- a/spec/build/cpukit/optmpci.yml
+++ b/spec/build/cpukit/optmpci.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   If set to "True", then the message passing based multiprocessing support
   (MPCI) is enabled, otherwise it is disabled.  Do not confuse this with the
diff --git a/spec/build/cpukit/optnewlib.yml b/spec/build/cpukit/optnewlib.yml
index a35156cafa..f9ed25d9cb 100644
--- a/spec/build/cpukit/optnewlib.yml
+++ b/spec/build/cpukit/optnewlib.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 Newlib C library support
 enabled-by: true
diff --git a/spec/build/cpukit/optnocoveragecflags.yml b/spec/build/cpukit/optnocoveragecflags.yml
index 4cdb245f3e..fcae525e50 100644
--- a/spec/build/cpukit/optnocoveragecflags.yml
+++ b/spec/build/cpukit/optnocoveragecflags.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: []
-default-by-variant: []
+default:
+- enabled-by: true
+  value: []
 description: |
   Compiler flags recommended for components which should generate coverage
   information.
diff --git a/spec/build/cpukit/optnocoverageldflags.yml b/spec/build/cpukit/optnocoverageldflags.yml
index 247b171d26..4167dafdd9 100644
--- a/spec/build/cpukit/optnocoverageldflags.yml
+++ b/spec/build/cpukit/optnocoverageldflags.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: []
-default-by-variant: []
+default:
+- enabled-by: true
+  value: []
 description: |
   Linker flags recommended for executables which contain modules which generate
   coverage information.
diff --git a/spec/build/cpukit/optparavirt.yml b/spec/build/cpukit/optparavirt.yml
index 3a06ce7930..51d4dd3d22 100644
--- a/spec/build/cpukit/optparavirt.yml
+++ b/spec/build/cpukit/optparavirt.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the para-virtualization support
 enabled-by: true
diff --git a/spec/build/cpukit/optposix.yml b/spec/build/cpukit/optposix.yml
index 15f6abc2a2..d74e928373 100644
--- a/spec/build/cpukit/optposix.yml
+++ b/spec/build/cpukit/optposix.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable support for POSIX signals
 enabled-by: true
diff --git a/spec/build/cpukit/optprofiling.yml b/spec/build/cpukit/optprofiling.yml
index c47be24fe2..7b351ee9db 100644
--- a/spec/build/cpukit/optprofiling.yml
+++ b/spec/build/cpukit/optprofiling.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the SMP lock profiling support
 enabled-by: true
diff --git a/spec/build/cpukit/optsmp.yml b/spec/build/cpukit/optsmp.yml
index db404efe21..bbe93443ad 100644
--- a/spec/build/cpukit/optsmp.yml
+++ b/spec/build/cpukit/optsmp.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable the Symmetric Multiprocessing (SMP) support
 enabled-by:
diff --git a/spec/build/cpukit/optszblkcnt.yml b/spec/build/cpukit/optszblkcnt.yml
index 292c27c89b..07a53fe880 100644
--- a/spec/build/cpukit/optszblkcnt.yml
+++ b/spec/build/cpukit/optszblkcnt.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/optszblksize.yml b/spec/build/cpukit/optszblksize.yml
index 4e11f51106..34c931e5b6 100644
--- a/spec/build/cpukit/optszblksize.yml
+++ b/spec/build/cpukit/optszblksize.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/optszmode.yml b/spec/build/cpukit/optszmode.yml
index d9e19ec814..37a50e1ca5 100644
--- a/spec/build/cpukit/optszmode.yml
+++ b/spec/build/cpukit/optszmode.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/optszoff.yml b/spec/build/cpukit/optszoff.yml
index 49e9231dd3..a08dff2c1b 100644
--- a/spec/build/cpukit/optszoff.yml
+++ b/spec/build/cpukit/optszoff.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/optsztime.yml b/spec/build/cpukit/optsztime.yml
index 85564321ca..8a44801163 100644
--- a/spec/build/cpukit/optsztime.yml
+++ b/spec/build/cpukit/optsztime.yml
@@ -6,8 +6,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: []
diff --git a/spec/build/cpukit/optvermaj.yml b/spec/build/cpukit/optvermaj.yml
index 9dbded9e64..b04c94ef06 100644
--- a/spec/build/cpukit/optvermaj.yml
+++ b/spec/build/cpukit/optvermaj.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/optvermin.yml b/spec/build/cpukit/optvermin.yml
index 29c01a7c91..c3a97ce9d7 100644
--- a/spec/build/cpukit/optvermin.yml
+++ b/spec/build/cpukit/optvermin.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/optverrev.yml b/spec/build/cpukit/optverrev.yml
index cbe7fecc66..726de4cdcf 100644
--- a/spec/build/cpukit/optverrev.yml
+++ b/spec/build/cpukit/optverrev.yml
@@ -5,8 +5,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: []
diff --git a/spec/build/cpukit/optversion.yml b/spec/build/cpukit/optversion.yml
index 98a765e724..c3b33d66ff 100644
--- a/spec/build/cpukit/optversion.yml
+++ b/spec/build/cpukit/optversion.yml
@@ -16,8 +16,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: []
diff --git a/spec/build/cpukit/optwarn.yml b/spec/build/cpukit/optwarn.yml
index fd97ec35b7..6cd2b7e1a3 100644
--- a/spec/build/cpukit/optwarn.yml
+++ b/spec/build/cpukit/optwarn.yml
@@ -9,8 +9,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -Wall
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Wall
 description: |
   Warning flags passed to the C and C++ compiler
 enabled-by: true
diff --git a/spec/build/cpukit/optwarncc.yml b/spec/build/cpukit/optwarncc.yml
index 4992c36110..7bdf7bf930 100644
--- a/spec/build/cpukit/optwarncc.yml
+++ b/spec/build/cpukit/optwarncc.yml
@@ -8,11 +8,12 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -Wmissing-prototypes
-- -Wimplicit-function-declaration
-- -Wstrict-prototypes
-- -Wnested-externs
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Wmissing-prototypes
+  - -Wimplicit-function-declaration
+  - -Wstrict-prototypes
+  - -Wnested-externs
 description: |
   Warning flags passed to the C compiler
 enabled-by: true
diff --git a/spec/build/cpukit/optwarncxx.yml b/spec/build/cpukit/optwarncxx.yml
index cd05555923..7fa86bb1cf 100644
--- a/spec/build/cpukit/optwarncxx.yml
+++ b/spec/build/cpukit/optwarncxx.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: []
-default-by-variant: []
+default:
+- enabled-by: true
+  value: []
 description: |
   Warning flags passed to the C++ compiler
 enabled-by: true