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.

35 files changed, 111 insertions, 102 deletions

diff --git a/spec/build/bsps/m68k/av5282/abi.yml b/spec/build/bsps/m68k/av5282/abi.yml
index 78f70236d3..4fa32aac03 100644
--- a/spec/build/bsps/m68k/av5282/abi.yml
+++ b/spec/build/bsps/m68k/av5282/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=528x
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=528x
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/csb360/abi.yml b/spec/build/bsps/m68k/csb360/abi.yml
index 1ff2806a6c..5f2353a7ff 100644
--- a/spec/build/bsps/m68k/csb360/abi.yml
+++ b/spec/build/bsps/m68k/csb360/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=5272
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=5272
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68340/abi.yml b/spec/build/bsps/m68k/gen68340/abi.yml
index 0daf8ee06b..ece4fe7c93 100644
--- a/spec/build/bsps/m68k/gen68340/abi.yml
+++ b/spec/build/bsps/m68k/gen68340/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=cpu32
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cpu32
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/abi.yml b/spec/build/bsps/m68k/gen68360/abi.yml
index 5e83fae804..603e342b59 100644
--- a/spec/build/bsps/m68k/gen68360/abi.yml
+++ b/spec/build/bsps/m68k/gen68360/abi.yml
@@ -7,16 +7,15 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu32
-default-by-variant:
-- value:
+- enabled-by: m68k/gen68360_040
+  value:
   - -mcpu=68040
-  variants:
-  - m68k/gen68360_040
-- value:
+- enabled-by: m68k/gen68360
+  value:
   - -mcpu=cpu32
-  variants:
-  - m68k/gen68360
+- enabled-by: true
+  value:
+  - -mcpu32
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/opt68360.yml b/spec/build/bsps/m68k/gen68360/opt68360.yml
index 11f0f054c9..36d100d549 100644
--- a/spec/build/bsps/m68k/gen68360/opt68360.yml
+++ b/spec/build/bsps/m68k/gen68360/opt68360.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:
-  - m68k/gen68360
+default:
+- enabled-by: m68k/gen68360
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the gen68360 BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/opt68360x040.yml b/spec/build/bsps/m68k/gen68360/opt68360x040.yml
index c176a780a3..9ddb102d26 100644
--- a/spec/build/bsps/m68k/gen68360/opt68360x040.yml
+++ b/spec/build/bsps/m68k/gen68360/opt68360x040.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:
-  - m68k/gen68360_040
+default:
+- enabled-by: m68k/gen68360_040
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the gen68360_040 BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/optpgh360.yml b/spec/build/bsps/m68k/gen68360/optpgh360.yml
index 8fea68fa42..f809a5eacf 100644
--- a/spec/build/bsps/m68k/gen68360/optpgh360.yml
+++ b/spec/build/bsps/m68k/gen68360/optpgh360.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:
-  - m68k/pgh360
+default:
+- enabled-by: m68k/pgh360
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the pgh360 BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/abi.yml b/spec/build/bsps/m68k/genmcf548x/abi.yml
index 6680decb4c..41dfdcfd05 100644
--- a/spec/build/bsps/m68k/genmcf548x/abi.yml
+++ b/spec/build/bsps/m68k/genmcf548x/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcfv4e
-- -Wa,-memac
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcfv4e
+  - -Wa,-memac
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml b/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml
index 6cf392fbb6..3ed37a1a38 100644
--- a/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml
@@ -5,14 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 100000000
-default-by-variant:
-- value: 132000000
-  variants:
-  - m68k/COBRA5475
-- value: 100000000
-  variants:
-  - m68k/m5484FireEngine
+default:
+- enabled-by: m68k/COBRA5475
+  value: 132000000
+- enabled-by: true
+  value: 100000000
 description: |
   The bus clock to be used inside the mcf54xx
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optdbug.yml b/spec/build/bsps/m68k/genmcf548x/optdbug.yml
index 26f93cd969..2ab3436d4d 100644
--- a/spec/build/bsps/m68k/genmcf548x/optdbug.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optdbug.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:
-  - m68k/COBRA5475
+default:
+- enabled-by: m68k/COBRA5475
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, we will not boot from RESET, but from Freescale DBug monitor.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optlowinit.yml b/spec/build/bsps/m68k/genmcf548x/optlowinit.yml
index 7d0f76a6be..d0fa425e1a 100644
--- a/spec/build/bsps/m68k/genmcf548x/optlowinit.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optlowinit.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:
-  - m68k/m5484FireEngine
+default:
+- enabled-by: m68k/m5484FireEngine
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, we will do all the low level init of the chip (like bus/memory...).
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.yml b/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.yml
index e2b71f1af1..8cd3f16be7 100644
--- a/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.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:
-  - m68k/m5484FireEngine
+default:
+- enabled-by: m68k/m5484FireEngine
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the m5484FireEngine BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mcf5206elite/abi.yml b/spec/build/bsps/m68k/mcf5206elite/abi.yml
index 703730cf3d..7884129ef0 100644
--- a/spec/build/bsps/m68k/mcf5206elite/abi.yml
+++ b/spec/build/bsps/m68k/mcf5206elite/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=5206
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=5206
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mcf5206elite/tstmcf5206elite.yml b/spec/build/bsps/m68k/mcf5206elite/tstmcf5206elite.yml
index d163120a76..55db90d0bf 100644
--- a/spec/build/bsps/m68k/mcf5206elite/tstmcf5206elite.yml
+++ b/spec/build/bsps/m68k/mcf5206elite/tstmcf5206elite.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: []
diff --git a/spec/build/bsps/m68k/mcf52235/abi.yml b/spec/build/bsps/m68k/mcf52235/abi.yml
index 643eaa7548..c801d96c83 100644
--- a/spec/build/bsps/m68k/mcf52235/abi.yml
+++ b/spec/build/bsps/m68k/mcf52235/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=52235
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=52235
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mcf52235/tstmcf52235.yml b/spec/build/bsps/m68k/mcf52235/tstmcf52235.yml
index 82ed21d017..3b6a62b767 100644
--- a/spec/build/bsps/m68k/mcf52235/tstmcf52235.yml
+++ b/spec/build/bsps/m68k/mcf52235/tstmcf52235.yml
@@ -24,8 +24,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/m68k/mcf5225x/abi.yml b/spec/build/bsps/m68k/mcf5225x/abi.yml
index 643eaa7548..c801d96c83 100644
--- a/spec/build/bsps/m68k/mcf5225x/abi.yml
+++ b/spec/build/bsps/m68k/mcf5225x/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=52235
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=52235
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml b/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml
index 60470420df..8958d2e837 100644
--- a/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml
+++ b/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.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/m68k/mcf5235/abi.yml b/spec/build/bsps/m68k/mcf5235/abi.yml
index 3e7f43f45f..174e6baefe 100644
--- a/spec/build/bsps/m68k/mcf5235/abi.yml
+++ b/spec/build/bsps/m68k/mcf5235/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=5235
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=5235
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mcf5329/abi.yml b/spec/build/bsps/m68k/mcf5329/abi.yml
index 163fedd212..0e5cf944cb 100644
--- a/spec/build/bsps/m68k/mcf5329/abi.yml
+++ b/spec/build/bsps/m68k/mcf5329/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=5307
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=5307
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mrm332/abi.yml b/spec/build/bsps/m68k/mrm332/abi.yml
index 0daf8ee06b..ece4fe7c93 100644
--- a/spec/build/bsps/m68k/mrm332/abi.yml
+++ b/spec/build/bsps/m68k/mrm332/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=cpu32
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cpu32
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mrm332/tstmrm332.yml b/spec/build/bsps/m68k/mrm332/tstmrm332.yml
index b19261b759..8650d81f66 100644
--- a/spec/build/bsps/m68k/mrm332/tstmrm332.yml
+++ b/spec/build/bsps/m68k/mrm332/tstmrm332.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/bsps/m68k/mvme147/abi.yml b/spec/build/bsps/m68k/mvme147/abi.yml
index 9d29b297c5..2860b5b968 100644
--- a/spec/build/bsps/m68k/mvme147/abi.yml
+++ b/spec/build/bsps/m68k/mvme147/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=68030
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=68030
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme147s/abi.yml b/spec/build/bsps/m68k/mvme147s/abi.yml
index 9d29b297c5..2860b5b968 100644
--- a/spec/build/bsps/m68k/mvme147s/abi.yml
+++ b/spec/build/bsps/m68k/mvme147s/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=68030
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=68030
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme162/abi.yml b/spec/build/bsps/m68k/mvme162/abi.yml
index 87a7b8c43a..a9fc5a686c 100644
--- a/spec/build/bsps/m68k/mvme162/abi.yml
+++ b/spec/build/bsps/m68k/mvme162/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=68040
-- -msoft-float
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=68040
+  - -msoft-float
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme162/tstmvme162.yml b/spec/build/bsps/m68k/mvme162/tstmvme162.yml
index 4136ac87e3..ffa4b25615 100644
--- a/spec/build/bsps/m68k/mvme162/tstmvme162.yml
+++ b/spec/build/bsps/m68k/mvme162/tstmvme162.yml
@@ -8,8 +8,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/m68k/mvme162/tstmvme162lx.yml b/spec/build/bsps/m68k/mvme162/tstmvme162lx.yml
index 4136ac87e3..ffa4b25615 100644
--- a/spec/build/bsps/m68k/mvme162/tstmvme162lx.yml
+++ b/spec/build/bsps/m68k/mvme162/tstmvme162lx.yml
@@ -8,8 +8,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/m68k/mvme167/abi.yml b/spec/build/bsps/m68k/mvme167/abi.yml
index 3bedb8a896..3caa563de3 100644
--- a/spec/build/bsps/m68k/mvme167/abi.yml
+++ b/spec/build/bsps/m68k/mvme167/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=68040
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=68040
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optconminor.yml b/spec/build/bsps/m68k/mvme167/optconminor.yml
index f6694db348..350301d8b2 100644
--- a/spec/build/bsps/m68k/mvme167/optconminor.yml
+++ b/spec/build/bsps/m68k/mvme167/optconminor.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: |
   Port to use for the RTEMS console.  0 - /dev/tty0, Serial Port 1/Console on the MVME712M.  1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.  2 - /dev/tty2, Serial Port 3 on the MVME712M.  3 - /dev/tty3, Serial Port 4 on the MVME712M.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optintlvl.yml b/spec/build/bsps/m68k/mvme167/optintlvl.yml
index 6b5005c11d..04c2b0aeb1 100644
--- a/spec/build/bsps/m68k/mvme167/optintlvl.yml
+++ b/spec/build/bsps/m68k/mvme167/optintlvl.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: |
   Interrupt level for the CD2401(when CD2401_IO_MODE == 1).
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optiomode.yml b/spec/build/bsps/m68k/mvme167/optiomode.yml
index 44b38da713..cb42a8f693 100644
--- a/spec/build/bsps/m68k/mvme167/optiomode.yml
+++ b/spec/build/bsps/m68k/mvme167/optiomode.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: |
   0 for polled I/O, 1 for interrupt-driven.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optmvme167.yml b/spec/build/bsps/m68k/mvme167/optmvme167.yml
index b857d705bd..6863696c47 100644
--- a/spec/build/bsps/m68k/mvme167/optmvme167.yml
+++ b/spec/build/bsps/m68k/mvme167/optmvme167.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: |
   Defines mvme167 in <bspopts.h>.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optprintkminor.yml b/spec/build/bsps/m68k/mvme167/optprintkminor.yml
index 5976e1dbbb..cad5de52c7 100644
--- a/spec/build/bsps/m68k/mvme167/optprintkminor.yml
+++ b/spec/build/bsps/m68k/mvme167/optprintkminor.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 1
 description: |
   Port to use for printk debugging output.  0 - /dev/tty0, Serial Port 1/Console on the MVME712M.  1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.  2 - /dev/tty2, Serial Port 3 on the MVME712M.  3 - /dev/tty3, Serial Port 4 on the MVME712M.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optuseterm.yml b/spec/build/bsps/m68k/mvme167/optuseterm.yml
index 585bd63329..8643c42d2b 100644
--- a/spec/build/bsps/m68k/mvme167/optuseterm.yml
+++ b/spec/build/bsps/m68k/mvme167/optuseterm.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: |
   1 for using termios based console.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/uC5282/abi.yml b/spec/build/bsps/m68k/uC5282/abi.yml
index a2d11d2bf3..7f0aa892f9 100644
--- a/spec/build/bsps/m68k/uC5282/abi.yml
+++ b/spec/build/bsps/m68k/uC5282/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=5282
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=5282
 description: |
   ABI flags
 enabled-by: true