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.

40 files changed, 188 insertions, 200 deletions

diff --git a/spec/build/bsps/powerpc/mpc55xxevb/abi.yml b/spec/build/bsps/powerpc/mpc55xxevb/abi.yml
index dca50fca94..6ca2be33ac 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/abi.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/abi.yml
@@ -7,12 +7,13 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=8540
-- -msoft-float
-- -meabi
-- -msdata=sysv
-- -mstrict-align
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=8540
+  - -msoft-float
+  - -meabi
+  - -msdata=sysv
+  - -mstrict-align
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml b/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml
index 7c1a1fa869..59231558ee 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml
@@ -5,17 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 99
-  variants:
-  - powerpc/gwlcfm
-- value: 111
-  variants:
-  - powerpc/mpc5668g
-- value: 66
-  variants:
-  - powerpc/mpc5674fevb
+default:
+- enabled-by: powerpc/gwlcfm
+  value: 99
+- enabled-by: powerpc/mpc5668g
+  value: 111
+- enabled-by: powerpc/mpc5674fevb
+  value: 66
+- enabled-by: true
+  value: 0
 description: |
   Must be defined to be the PLL multiplication factor for clock generation
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optbootflg.yml b/spec/build/bsps/powerpc/mpc55xxevb/optbootflg.yml
index a0ae88fc13..6e9070dea1 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optbootflg.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optbootflg.yml
@@ -5,8 +5,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 defined, builds in bootflags above the RCHW for setup in a debugger to avoid startup MMU setup
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optcachewritethru.yml b/spec/build/bsps/powerpc/mpc55xxevb/optcachewritethru.yml
index 0311e556f4..4680cae5aa 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optcachewritethru.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optcachewritethru.yml
@@ -5,8 +5,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: |
   use write-through for data cache
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optchipfam.yml b/spec/build/bsps/powerpc/mpc55xxevb/optchipfam.yml
index 38a1e3aaf4..96a4b57457 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optchipfam.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optchipfam.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: (MPC55XX_CHIP_TYPE / 10)
-default-by-variant: []
+default:
+- enabled-by: true
+  value: (MPC55XX_CHIP_TYPE / 10)
 description: |
   specifies the chip family in use (e.g. 555 for MPC5554)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml b/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml
index d1d037d34c..eaec92680d 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml
@@ -5,23 +5,19 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 5554
-default-by-variant:
-- value: 5516
-  variants:
-  - powerpc/gwlcfm
-- value: 5566
-  variants:
-  - powerpc/mpc5566evb
-- value: 5643
-  variants:
-  - powerpc/mpc5643l_evb
-- value: 5668
-  variants:
-  - powerpc/mpc5668g
-- value: 5674
-  variants:
-  - powerpc/mpc5674fevb
+default:
+- enabled-by: powerpc/gwlcfm
+  value: 5516
+- enabled-by: powerpc/mpc5566evb
+  value: 5566
+- enabled-by: powerpc/mpc5643l_evb
+  value: 5643
+- enabled-by: powerpc/mpc5668g
+  value: 5668
+- enabled-by: powerpc/mpc5674fevb
+  value: 5674
+- enabled-by: true
+  value: 5554
 description: |
   specifies the chip type in use (e.g. 5554 for MPC5554)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml b/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml
index d7cf9b927d..9bb07f5c4c 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml
@@ -5,17 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 23
-default-by-variant:
-- value: null
-  variants:
+default:
+- enabled-by:
   - powerpc/mpc5643l_evb
-- value: null
-  variants:
   - powerpc/mpc5668g
-- value: 31
-  variants:
-  - powerpc/mpc5674fevb
+  value: null
+- enabled-by: powerpc/mpc5674fevb
+  value: 31
+- enabled-by: true
+  value: 23
 description: |
   selects the eMIOS channel for the RTEMS system tick (the default is the last channel)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml b/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml
index 9ae42801cb..3baedae91c 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml
@@ -5,14 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: 3
-  variants:
-  - powerpc/mpc5643l_evb
-- value: 8
-  variants:
-  - powerpc/mpc5668g
+default:
+- enabled-by: powerpc/mpc5643l_evb
+  value: 3
+- enabled-by: powerpc/mpc5668g
+  value: 8
 description: |
   selects the PIT channel for the RTEMS system tick (the default is the last channel)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optconbaud.yml b/spec/build/bsps/powerpc/mpc55xxevb/optconbaud.yml
index bd26c32da6..fe3b27177d 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optconbaud.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optconbaud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 115200
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 115200
 description: |
   default console baud
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optconminor.yml b/spec/build/bsps/powerpc/mpc55xxevb/optconminor.yml
index 99b03fbde1..321862851b 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optconminor.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/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: |
   determines which serial device will be registered as /dev/console
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optearlystksz.yml b/spec/build/bsps/powerpc/mpc55xxevb/optearlystksz.yml
index 7c0c8a13a5..3dda8a0177 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optearlystksz.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optearlystksz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1024
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 1024
 description: |
   size of the early initialization stack in bytes
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/opteepromname.yml b/spec/build/bsps/powerpc/mpc55xxevb/opteepromname.yml
index 0ad69134d4..957ebb037a 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/opteepromname.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/opteepromname.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: eeprom
-  variants:
-  - powerpc/gwlcfm
+default:
+- enabled-by: powerpc/gwlcfm
+  value: eeprom
+- enabled-by: true
+  value: false
 description: |
   EEPROM name for LibI2C
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/opteeprompath.yml b/spec/build/bsps/powerpc/mpc55xxevb/opteeprompath.yml
index 1ee19aff5e..c1f59fbbf6 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/opteeprompath.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/opteeprompath.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: /dev/i2c1.eeprom
-  variants:
-  - powerpc/gwlcfm
+default:
+- enabled-by: powerpc/gwlcfm
+  value: /dev/i2c1.eeprom
+- enabled-by: true
+  value: false
 description: |
   EEPROM device file path
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml b/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml
index 931b97e56d..363f743bca 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml
@@ -5,14 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 66
-  variants:
-  - powerpc/gwlcfm
-- value: null
-  variants:
-  - powerpc/mpc5643l_evb
+default:
+- enabled-by: powerpc/gwlcfm
+  value: 66
+- enabled-by: powerpc/mpc5643l_evb
+  value: null
+- enabled-by: true
+  value: 0
 description: |
   Must be defined to set the EMIOS prescaler
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optenstartpro.yml b/spec/build/bsps/powerpc/mpc55xxevb/optenstartpro.yml
index 5fd2f8715b..139f48508e 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optenstartpro.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optenstartpro.yml
@@ -5,8 +5,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 defined, enable start prologue
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optesciirq.yml b/spec/build/bsps/powerpc/mpc55xxevb/optesciirq.yml
index 9724bdfddf..35f2ec7f28 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optesciirq.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optesciirq.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: |
   define to zero or one to disable or enable interrupts for the eSCI devices
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optexcbooke.yml b/spec/build/bsps/powerpc/mpc55xxevb/optexcbooke.yml
index e27cb4ab44..d97e53ccb0 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optexcbooke.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optexcbooke.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: |
   only support Book E exception types
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optexcfixdhdlr.yml b/spec/build/bsps/powerpc/mpc55xxevb/optexcfixdhdlr.yml
index b636d8022b..5661fc0f3e 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optexcfixdhdlr.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optexcfixdhdlr.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: |
   use fixed high-level exception handler
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllesyncr1.yml b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllesyncr1.yml
index 12e8d37ab5..25441fb90e 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllesyncr1.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllesyncr1.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 7
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 7
 description: |
   the FMPLL ESYNCR1[CLKCFG] value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml
index 84df5a1dad..2edc87f4af 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml
@@ -5,17 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 10
-  variants:
-  - powerpc/gwlcfm
-- value: 6
-  variants:
-  - powerpc/mpc5668g
-- value: 5
-  variants:
-  - powerpc/mpc5674fevb
+default:
+- enabled-by: powerpc/gwlcfm
+  value: 10
+- enabled-by: powerpc/mpc5668g
+  value: 6
+- enabled-by: powerpc/mpc5674fevb
+  value: 5
+- enabled-by: true
+  value: 0
 description: |
   Must be defined to be the PLL predivider factor for clock generation
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optgwlcfm.yml b/spec/build/bsps/powerpc/mpc55xxevb/optgwlcfm.yml
index a525ccf854..897f1f39ba 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optgwlcfm.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optgwlcfm.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/gwlcfm
+default:
+- enabled-by: powerpc/gwlcfm
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, use custom settings for GWLCFM board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml b/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml
index a5f7417674..45b3f0ad99 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml
@@ -5,17 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 63
-default-by-variant:
-- value: 127
-  variants:
+default:
+- enabled-by:
   - powerpc/mpc5643l_evb
-- value: 127
-  variants:
   - powerpc/mpc5566evb
-- value: 255
-  variants:
-  - powerpc/mpc5674fevb
+  value: 127
+- enabled-by: powerpc/mpc5674fevb
+  value: 255
+- enabled-by: true
+  value: 63
 description: |
   defines the maximum number of interrupt handlers
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml b/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml
index 232b759bf8..dddc3efa02 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml
@@ -5,10 +5,11 @@ 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: []
+  value: false
+- enabled-by: true
+  value: true
 description: |
   if defined, do low level initialization
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml
index cc549ede34..e5e43e36c4 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/mpc5566evb
+default:
+- enabled-by: powerpc/mpc5566evb
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, use custom settings for MPC5566EVB board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml
index 83a694c193..ee56129a23 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/mpc5674fevb
+default:
+- enabled-by: powerpc/mpc5674fevb
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, use custom settings for MPC5674FEVB board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml b/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml
index 0c081ab189..2a5b025e53 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml
@@ -5,14 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
+default:
+- enabled-by:
   - powerpc/mpc5566evb
-- value: true
-  variants:
   - powerpc/mpc5674fevb
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable NULL pointer protection
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optphycorempc5554.yml b/spec/build/bsps/powerpc/mpc55xxevb/optphycorempc5554.yml
index 0452770f84..059972f6b6 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optphycorempc5554.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optphycorempc5554.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/phycore_mpc5554
+default:
+- enabled-by: powerpc/phycore_mpc5554
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, use custom settings for phyCORE MPC5554 board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml b/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml
index 8b4fd9a0f0..89b792ca3c 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml
@@ -5,20 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 8000000
-default-by-variant:
-- value: 40000000
-  variants:
+default:
+- enabled-by:
   - powerpc/gwlcfm
-- value: 40000000
-  variants:
   - powerpc/mpc5643l_evb
-- value: 25000000
-  variants:
-  - powerpc/mpc5668g
-- value: 40000000
-  variants:
   - powerpc/mpc5674fevb
+  value: 40000000
+- enabled-by: powerpc/mpc5668g
+  value: 25000000
+- enabled-by: true
+  value: 8000000
 description: |
   None
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc91111.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc91111.yml
index 04a224edd0..82e24eb8c5 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc91111.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc91111.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/phycore_mpc5554
+default:
+- enabled-by: powerpc/phycore_mpc5554
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined the board has the SMC91111 networking chip.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9111enaddr.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9111enaddr.yml
index 3bb67b7621..628a324e24 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9111enaddr.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9111enaddr.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/phycore_mpc5554
+default:
+- enabled-by: powerpc/phycore_mpc5554
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined the SMC91111 chip has the ethernet address loaded at reset.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ibige.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ibige.yml
index bf47d9429c..e4ce934bc8 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ibige.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ibige.yml
@@ -5,8 +5,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 big endian support for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218iled.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218iled.yml
index a3de39efac..f7adeec254 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218iled.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218iled.yml
@@ -5,8 +5,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 LED outputs for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml
index cfba195031..48c5b6c028 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml
@@ -5,11 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: 193
-  variants:
-  - powerpc/mpc5566evb
+default:
+- enabled-by: powerpc/mpc5566evb
+  value: 193
 description: |
   IRQ pin for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml
index d770ce02ed..b83e7f03d4 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml
@@ -5,11 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: 186
-  variants:
-  - powerpc/mpc5566evb
+default:
+- enabled-by: powerpc/mpc5566evb
+  value: 186
 description: |
   reset pin for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218irxchn.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218irxchn.yml
index 0753f5b85b..8d74b19b86 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218irxchn.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218irxchn.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 49
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 49
 description: |
   receive eDMA channel for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218itxchn.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218itxchn.yml
index 359fb5302c..b87a485459 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218itxchn.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218itxchn.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 48
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 48
 description: |
   transmit eDMA channel for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml
index 6d4e1554f1..9d206527b7 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml
@@ -5,17 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 66000000
-  variants:
-  - powerpc/gwlcfm
-- value: 116000000
-  variants:
-  - powerpc/mpc5668g
-- value: 264000000
-  variants:
-  - powerpc/mpc5674fevb
+default:
+- enabled-by: powerpc/gwlcfm
+  value: 66000000
+- enabled-by: powerpc/mpc5668g
+  value: 116000000
+- enabled-by: powerpc/mpc5674fevb
+  value: 264000000
+- enabled-by: true
+  value: 0
 description: |
   The system clock frequency in Hz.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml
index 293e2ed9a6..4374a04169 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant:
-- value: 2
-  variants:
-  - powerpc/mpc5674fevb
+default:
+- enabled-by: powerpc/mpc5674fevb
+  value: 2
+- enabled-by: true
+  value: 1
 description: |
   system clock divider
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/tstgwlcfm.yml b/spec/build/bsps/powerpc/mpc55xxevb/tstgwlcfm.yml
index 5b8288c0e0..c1422d3d6c 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/tstgwlcfm.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/tstgwlcfm.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:
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/tstmpc5643levb.yml b/spec/build/bsps/powerpc/mpc55xxevb/tstmpc5643levb.yml
index ffc7c2feaf..c99f429f9e 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/tstmpc5643levb.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/tstmpc5643levb.yml
@@ -9,8 +9,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: