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.

34 files changed, 135 insertions, 156 deletions

diff --git a/spec/build/bsps/arm/lpc24xx/abi.yml b/spec/build/bsps/arm/lpc24xx/abi.yml
index e032f2d9a6..c63b60e295 100644
--- a/spec/build/bsps/arm/lpc24xx/abi.yml
+++ b/spec/build/bsps/arm/lpc24xx/abi.yml
@@ -7,25 +7,26 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=arm7tdmi-s
-- -mthumb
-default-by-variant:
-- value:
-  - -mthumb
-  - -mcpu=cortex-m3
-  variants:
+- enabled-by:
   - arm/lpc17xx_ea_ram
   - arm/lpc17xx_ea_rom_int
   - arm/lpc17xx_plx800_ram
   - arm/lpc17xx_plx800_rom_int
-- value:
+  value:
+  - -mthumb
+  - -mcpu=cortex-m3
+- enabled-by:
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
+  value:
   - -mcpu=cortex-m4
   - -mthumb
   - -mfloat-abi=hard
   - -mfpu=auto
-  variants:
-  - arm/lpc40xx_ea_ram
-  - arm/lpc40xx_ea_rom_int
+- enabled-by: true
+  value:
+  - -mcpu=arm7tdmi-s
+  - -mthumb
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optcclk.yml b/spec/build/bsps/arm/lpc24xx/optcclk.yml
index e9700ce101..1a44ff0b35 100644
--- a/spec/build/bsps/arm/lpc24xx/optcclk.yml
+++ b/spec/build/bsps/arm/lpc24xx/optcclk.yml
@@ -5,24 +5,23 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 72000000
-default-by-variant:
-- value: 96000000
-  variants:
+default:
+- enabled-by:
   - arm/lpc17xx_ea_ram
   - arm/lpc17xx_ea_rom_int
-- value: 96000000
-  variants:
   - arm/lpc40xx_ea_ram
   - arm/lpc40xx_ea_rom_int
-- value: 58982400
-  variants:
+  value: 96000000
+- enabled-by:
   - arm/lpc2362
   - arm/lpc23xx_tli800
-- value: 51612800
-  variants:
+  value: 58982400
+- enabled-by:
   - arm/lpc24xx_plx800_ram
   - arm/lpc24xx_plx800_rom_int
+  value: 51612800
+- enabled-by: true
+  value: 72000000
 description: |
   CPU clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optconcfg.yml b/spec/build/bsps/arm/lpc24xx/optconcfg.yml
index 4e09164cdf..8a903b4380 100644
--- a/spec/build/bsps/arm/lpc24xx/optconcfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optconcfg.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: |
   configuration for console (UART 0)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optdmachn.yml b/spec/build/bsps/arm/lpc24xx/optdmachn.yml
index f1f57dca60..14638cbd36 100644
--- a/spec/build/bsps/arm/lpc24xx/optdmachn.yml
+++ b/spec/build/bsps/arm/lpc24xx/optdmachn.yml
@@ -5,10 +5,8 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 2
-default-by-variant:
-- value: 8
-  variants:
+default:
+- enabled-by:
   - arm/lpc1768_mbed
   - arm/lpc1768_mbed_ahb_ram
   - arm/lpc1768_mbed_ahb_ram_eth
@@ -16,10 +14,11 @@ default-by-variant:
   - arm/lpc17xx_ea_rom_int
   - arm/lpc17xx_plx800_ram
   - arm/lpc17xx_plx800_rom_int
-- value: 8
-  variants:
   - arm/lpc40xx_ea_ram
   - arm/lpc40xx_ea_rom_int
+  value: 8
+- enabled-by: true
+  value: 2
 description: |
   DMA channel count
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml b/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml
index 36ff19f07b..7afec15896 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml
@@ -5,16 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant:
-- value: 2
-  variants:
+default:
+- enabled-by:
   - arm/lpc17xx_ea_ram
   - arm/lpc17xx_ea_rom_int
-- value: 2
-  variants:
   - arm/lpc40xx_ea_ram
   - arm/lpc40xx_ea_rom_int
+  value: 2
+- enabled-by: true
+  value: 1
 description: |
   clock divider for EMCCLK (EMCCLK = CCLK / EMCCLKDIV)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml b/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml
index c6162af143..3b0b3960f2 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.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:
   - arm/lpc17xx_ea_rom_int
-- value: true
-  variants:
   - arm/lpc40xx_ea_rom_int
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable ISSI IS42S32800B configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml b/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml
index 71d2b38f27..b4ebc7a3f6 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml
@@ -5,12 +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:
   - arm/lpc17xx_plx800_rom_int
   - arm/lpc24xx_plx800_rom_int
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable ISSI IS42S32800D7 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml b/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml
index 02f233165c..2f56d4fcc6 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml
@@ -5,12 +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:
   - arm/lpc24xx_ncs_rom_ext
   - arm/lpc24xx_ncs_rom_int
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable M29W160E configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml b/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml
index 66aa8c5cad..8abab7cd1d 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml
@@ -5,12 +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:
   - arm/lpc17xx_plx800_rom_int
   - arm/lpc24xx_plx800_rom_int
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable M29W320E70 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml b/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml
index 02b92e0710..aefaa8de24 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml
@@ -5,12 +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:
   - arm/lpc24xx_ncs_rom_ext
   - arm/lpc24xx_ncs_rom_int
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable Micron MT48LC4M16A2 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcsst39vf3201.yml b/spec/build/bsps/arm/lpc24xx/optemcsst39vf3201.yml
index 851c28a275..fba7e67905 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcsst39vf3201.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcsst39vf3201.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 SST39VF3201 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemctest.yml b/spec/build/bsps/arm/lpc24xx/optemctest.yml
index 4153bd2664..96451dc88f 100644
--- a/spec/build/bsps/arm/lpc24xx/optemctest.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemctest.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 tests for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcw9825g2jb75i.yml b/spec/build/bsps/arm/lpc24xx/optemcw9825g2jb75i.yml
index 2be3f76372..8f6b79f752 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcw9825g2jb75i.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcw9825g2jb75i.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 Winbond W9825G2JB75I configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optethdownpin.yml b/spec/build/bsps/arm/lpc24xx/optethdownpin.yml
index c3889b0eea..56a7c932d8 100644
--- a/spec/build/bsps/arm/lpc24xx/optethdownpin.yml
+++ b/spec/build/bsps/arm/lpc24xx/optethdownpin.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: |
   optional Ethernet power-down pin, output is set to high to enable power
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optethrmii.yml b/spec/build/bsps/arm/lpc24xx/optethrmii.yml
index 6dc25d0d86..4d95bc10aa 100644
--- a/spec/build/bsps/arm/lpc24xx/optethrmii.yml
+++ b/spec/build/bsps/arm/lpc24xx/optethrmii.yml
@@ -5,14 +5,15 @@ 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:
   - arm/lpc17xx_ea_ram
   - arm/lpc17xx_ea_rom_int
   - arm/lpc40xx_ea_ram
   - arm/lpc40xx_ea_rom_int
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable RMII for Ethernet
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optheapext.yml b/spec/build/bsps/arm/lpc24xx/optheapext.yml
index 90acde9447..03254e3003 100644
--- a/spec/build/bsps/arm/lpc24xx/optheapext.yml
+++ b/spec/build/bsps/arm/lpc24xx/optheapext.yml
@@ -5,12 +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:
   - arm/lpc2362
   - arm/lpc23xx_tli800
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable heap extend by Ethernet and USB regions
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optoscmain.yml b/spec/build/bsps/arm/lpc24xx/optoscmain.yml
index 2a483213de..67faf6455c 100644
--- a/spec/build/bsps/arm/lpc24xx/optoscmain.yml
+++ b/spec/build/bsps/arm/lpc24xx/optoscmain.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 12000000
-default-by-variant:
-- value: 3686400
-  variants:
+default:
+- enabled-by:
   - arm/lpc2362
   - arm/lpc23xx_tli800
+  value: 3686400
+- enabled-by: true
+  value: 12000000
 description: |
   main oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optoscrtc.yml b/spec/build/bsps/arm/lpc24xx/optoscrtc.yml
index 0b66f8a553..dc67d0e776 100644
--- a/spec/build/bsps/arm/lpc24xx/optoscrtc.yml
+++ b/spec/build/bsps/arm/lpc24xx/optoscrtc.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 32768
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 32768
 description: |
   RTC oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optotgi2c.yml b/spec/build/bsps/arm/lpc24xx/optotgi2c.yml
index 3e7baeadbc..a80810e3ae 100644
--- a/spec/build/bsps/arm/lpc24xx/optotgi2c.yml
+++ b/spec/build/bsps/arm/lpc24xx/optotgi2c.yml
@@ -5,16 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x0000005e
-  variants:
+default:
+- enabled-by:
   - arm/lpc17xx_ea_ram
   - arm/lpc17xx_ea_rom_int
-- value: 0x0000005e
-  variants:
   - arm/lpc40xx_ea_ram
   - arm/lpc40xx_ea_rom_int
+  value: 0x0000005e
+- enabled-by: true
+  value: 0x00000000
 description: |
   USB OTG transceiver I2C address used by USB stack
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml b/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml
index bc4984bc3d..ac6664f415 100644
--- a/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml
+++ b/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml
@@ -5,16 +5,15 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant:
-- value: 2
-  variants:
+default:
+- enabled-by:
   - arm/lpc17xx_ea_ram
   - arm/lpc17xx_ea_rom_int
-- value: 2
-  variants:
   - arm/lpc40xx_ea_ram
   - arm/lpc40xx_ea_rom_int
+  value: 2
+- enabled-by: true
+  value: 1
 description: |
   clock divider for default PCLK (PCLK = CCLK / PCLKDIV)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optresetvec.yml b/spec/build/bsps/arm/lpc24xx/optresetvec.yml
index 96e57b3adb..a96613d15b 100644
--- a/spec/build/bsps/arm/lpc24xx/optresetvec.yml
+++ b/spec/build/bsps/arm/lpc24xx/optresetvec.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x80000040
-  variants:
-  - arm/lpc24xx_ncs_rom_ext
+default:
+- enabled-by: arm/lpc24xx_ncs_rom_ext
+  value: 0x80000040
+- enabled-by: true
+  value: 0x00000000
 description: |
   reset vector address for BSP start
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optstopeth.yml b/spec/build/bsps/arm/lpc24xx/optstopeth.yml
index 2baf76da8c..cb0ac373eb 100644
--- a/spec/build/bsps/arm/lpc24xx/optstopeth.yml
+++ b/spec/build/bsps/arm/lpc24xx/optstopeth.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/lpc2362
   - arm/lpc23xx_tli800
+  value: false
+- enabled-by: true
+  value: true
 description: |
   stop Ethernet controller at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optstopgpdma.yml b/spec/build/bsps/arm/lpc24xx/optstopgpdma.yml
index 5705cc03ef..b7590138a9 100644
--- a/spec/build/bsps/arm/lpc24xx/optstopgpdma.yml
+++ b/spec/build/bsps/arm/lpc24xx/optstopgpdma.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: |
   stop general purpose DMA at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optstopusb.yml b/spec/build/bsps/arm/lpc24xx/optstopusb.yml
index b895ff7df3..a6d986948c 100644
--- a/spec/build/bsps/arm/lpc24xx/optstopusb.yml
+++ b/spec/build/bsps/arm/lpc24xx/optstopusb.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/lpc2362
   - arm/lpc23xx_tli800
+  value: false
+- enabled-by: true
+  value: true
 description: |
   stop USB controller at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml b/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml
index 055f8bbbee..91d89c9c37 100644
--- a/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml
@@ -5,14 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: false
-  variants:
-  - arm/lpc17xx_plx800_ram
-  - arm/lpc17xx_plx800_rom_int
-  - arm/lpc24xx_plx800_ram
-  - arm/lpc24xx_plx800_rom_int
+default:
+- enabled-by: true
+  value: false
 description: |
   configuration for UART 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml b/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml
index 0f9bbad26b..abb5d0bedc 100644
--- a/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml
@@ -5,23 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: false
-  variants:
-  - arm/lpc2362
-  - arm/lpc23xx_tli800
-- value: false
-  variants:
-  - arm/lpc24xx_ncs_ram
-  - arm/lpc24xx_ncs_rom_ext
-  - arm/lpc24xx_ncs_rom_int
-- value: false
-  variants:
-  - arm/lpc17xx_plx800_ram
-  - arm/lpc17xx_plx800_rom_int
-  - arm/lpc24xx_plx800_ram
-  - arm/lpc24xx_plx800_rom_int
+default:
+- enabled-by: true
+  value: false
 description: |
   configuration for UART 2
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml b/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml
index 991be593f3..58363efbec 100644
--- a/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml
@@ -5,17 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: false
-  variants:
-  - arm/lpc2362
-  - arm/lpc23xx_tli800
-- value: false
-  variants:
-  - arm/lpc24xx_ncs_ram
-  - arm/lpc24xx_ncs_rom_ext
-  - arm/lpc24xx_ncs_rom_int
+default:
+- enabled-by: true
+  value: false
 description: |
   configuration for UART 3
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuartbaud.yml b/spec/build/bsps/arm/lpc24xx/optuartbaud.yml
index e772d71381..bec352e265 100644
--- a/spec/build/bsps/arm/lpc24xx/optuartbaud.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuartbaud.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: |
   baud for UARTs
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/tstlpc17xxearomint.yml b/spec/build/bsps/arm/lpc24xx/tstlpc17xxearomint.yml
index 3ded8b9878..140cf80a25 100644
--- a/spec/build/bsps/arm/lpc24xx/tstlpc17xxearomint.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstlpc17xxearomint.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/arm/lpc24xx/tstlpc17xxplx800romint.yml b/spec/build/bsps/arm/lpc24xx/tstlpc17xxplx800romint.yml
index 3ded8b9878..140cf80a25 100644
--- a/spec/build/bsps/arm/lpc24xx/tstlpc17xxplx800romint.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstlpc17xxplx800romint.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/arm/lpc24xx/tstlpc23xx.yml b/spec/build/bsps/arm/lpc24xx/tstlpc23xx.yml
index e43ca25d3d..4d3b175bd6 100644
--- a/spec/build/bsps/arm/lpc24xx/tstlpc23xx.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstlpc23xx.yml
@@ -58,8 +58,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/arm/lpc24xx/tstlpc40xxearomint.yml b/spec/build/bsps/arm/lpc24xx/tstlpc40xxearomint.yml
index 3ded8b9878..140cf80a25 100644
--- a/spec/build/bsps/arm/lpc24xx/tstlpc40xxearomint.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstlpc40xxearomint.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/arm/lpc24xx/tstncsromint.yml b/spec/build/bsps/arm/lpc24xx/tstncsromint.yml
index 3ded8b9878..140cf80a25 100644
--- a/spec/build/bsps/arm/lpc24xx/tstncsromint.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstncsromint.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/arm/lpc24xx/tstplx800romint.yml b/spec/build/bsps/arm/lpc24xx/tstplx800romint.yml
index 3ded8b9878..140cf80a25 100644
--- a/spec/build/bsps/arm/lpc24xx/tstplx800romint.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstplx800romint.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: