18 files changed, 81 insertions, 82 deletions
diff --git a/spec/build/bsps/arm/lm3s69xx/abi.yml b/spec/build/bsps/arm/lm3s69xx/abi.yml
index 77d5db8cf7..37f0e6056c 100644
--- a/spec/build/bsps/arm/lm3s69xx/abi.yml
+++ b/spec/build/bsps/arm/lm3s69xx/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mthumb
-- -mcpu=cortex-m3
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mthumb
+  - -mcpu=cortex-m3
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optenuart0.yml b/spec/build/bsps/arm/lm3s69xx/optenuart0.yml
index fa3254dbf5..c376176aef 100644
--- a/spec/build/bsps/arm/lm3s69xx/optenuart0.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optenuart0.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: |
   enable UART 0
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optenuart1.yml b/spec/build/bsps/arm/lm3s69xx/optenuart1.yml
index 42c6133cf5..e992cbcc87 100644
--- a/spec/build/bsps/arm/lm3s69xx/optenuart1.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optenuart1.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 UART 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optenuart2.yml b/spec/build/bsps/arm/lm3s69xx/optenuart2.yml
index 0de60cb7a7..7e312b4df7 100644
--- a/spec/build/bsps/arm/lm3s69xx/optenuart2.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optenuart2.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 UART 2
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml b/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml
index 77e1c9219e..a1a9003a86 100644
--- a/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optgpioahb.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/lm3s3749
-- value: true
-  variants:
   - arm/lm4f120
+  value: true
+- enabled-by: true
+  value: false
 description: |
   use AHB apperture to access GPIO registers
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optgpionum.yml b/spec/build/bsps/arm/lm3s69xx/optgpionum.yml
index bbccdd5a58..da509e1163 100644
--- a/spec/build/bsps/arm/lm3s69xx/optgpionum.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optgpionum.yml
@@ -5,18 +5,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 8
-  variants:
-  - arm/lm3s3749
-- value: 7
-  variants:
+default:
+- enabled-by: arm/lm3s3749
+  value: 8
+- enabled-by:
   - arm/lm3s6965
   - arm/lm3s6965_qemu
-- value: 6
-  variants:
-  - arm/lm4f120
+  value: 7
+- enabled-by: arm/lm4f120
+  value: 6
+- enabled-by: true
+  value: 0
 description: |
   number of GPIO blocks supported by MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml b/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml
index 9ca33cbe94..fd0a6ccba2 100644
--- a/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optlm3s3749.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:
-  - arm/lm3s3749
+default:
+- enabled-by: arm/lm3s3749
+  value: true
+- enabled-by: true
+  value: false
 description: |
   board has LM3S3749 MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml b/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml
index 6c11733729..109997f5ee 100644
--- a/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optlm3s6965.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/lm3s6965
   - arm/lm3s6965_qemu
+  value: true
+- enabled-by: true
+  value: false
 description: |
   board has LM3S6965 MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml b/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml
index af60aee4d6..42ecbf25db 100644
--- a/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optlm4f120.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:
-  - arm/lm4f120
+default:
+- enabled-by: arm/lm4f120
+  value: true
+- enabled-by: true
+  value: false
 description: |
   board has LM4F120xxx MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optssiblks.yml b/spec/build/bsps/arm/lm3s69xx/optssiblks.yml
index 3234606781..198e978a77 100644
--- a/spec/build/bsps/arm/lm3s69xx/optssiblks.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optssiblks.yml
@@ -5,18 +5,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 2
-  variants:
-  - arm/lm3s3749
-- value: 1
-  variants:
+default:
+- enabled-by: arm/lm3s3749
+  value: 2
+- enabled-by:
   - arm/lm3s6965
   - arm/lm3s6965_qemu
-- value: 4
-  variants:
-  - arm/lm4f120
+  value: 1
+- enabled-by: arm/lm4f120
+  value: 4
+- enabled-by: true
+  value: 0
 description: |
   number of SSI blocks supported by MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optssiclk.yml b/spec/build/bsps/arm/lm3s69xx/optssiclk.yml
index b278880160..8c2b76e3bd 100644
--- a/spec/build/bsps/arm/lm3s69xx/optssiclk.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optssiclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 1000000
 description: |
   SSI clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optsysclk.yml b/spec/build/bsps/arm/lm3s69xx/optsysclk.yml
index 14fcbcd84d..9bde41291f 100644
--- a/spec/build/bsps/arm/lm3s69xx/optsysclk.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optsysclk.yml
@@ -5,16 +5,16 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 50000000
-  variants:
+default:
+- enabled-by:
   - arm/lm3s3749
   - arm/lm3s6965
   - arm/lm3s6965_qemu
-- value: 80000000
-  variants:
-  - arm/lm4f120
+  value: 50000000
+- enabled-by: arm/lm4f120
+  value: 80000000
+- enabled-by: true
+  value: 0
 description: |
   system clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optuartbaud.yml b/spec/build/bsps/arm/lm3s69xx/optuartbaud.yml
index 9b1deff47c..fa80b62bb7 100644
--- a/spec/build/bsps/arm/lm3s69xx/optuartbaud.yml
+++ b/spec/build/bsps/arm/lm3s69xx/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/lm3s69xx/optudma.yml b/spec/build/bsps/arm/lm3s69xx/optudma.yml
index 9445b273ec..7c433389c9 100644
--- a/spec/build/bsps/arm/lm3s69xx/optudma.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optudma.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/lm3s3749
-- value: true
-  variants:
   - arm/lm4f120
+  value: true
+- enabled-by: true
+  value: false
 description: |
   defined if MCU supports UDMA
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml b/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml
index 3854c6e3e9..a2d232a533 100644
--- a/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml
@@ -5,18 +5,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x0000000e
-  variants:
+default:
+- enabled-by:
   - arm/lm3s6965
   - arm/lm3s6965_qemu
-- value: 0x00000010
-  variants:
-  - arm/lm3s3749
-- value: 0x00000015
-  variants:
-  - arm/lm4f120
+  value: 0x0000000e
+- enabled-by: arm/lm3s3749
+  value: 0x00000010
+- enabled-by: arm/lm4f120
+  value: 0x00000015
+- enabled-by: true
+  value: 0x00000000
 description: |
   crystal configuration for RCC register
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/tstlm3s3749.yml b/spec/build/bsps/arm/lm3s69xx/tstlm3s3749.yml
index e449e68ea0..82338c2298 100644
--- a/spec/build/bsps/arm/lm3s69xx/tstlm3s3749.yml
+++ b/spec/build/bsps/arm/lm3s69xx/tstlm3s3749.yml
@@ -28,8 +28,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/lm3s69xx/tstlm3s6965.yml b/spec/build/bsps/arm/lm3s69xx/tstlm3s6965.yml
index c7405f76dd..675af7406f 100644
--- a/spec/build/bsps/arm/lm3s69xx/tstlm3s6965.yml
+++ b/spec/build/bsps/arm/lm3s69xx/tstlm3s6965.yml
@@ -13,8 +13,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/lm3s69xx/tstlm4f120.yml b/spec/build/bsps/arm/lm3s69xx/tstlm4f120.yml
index 0ea7bf2b7c..49dda63ed0 100644
--- a/spec/build/bsps/arm/lm3s69xx/tstlm4f120.yml
+++ b/spec/build/bsps/arm/lm3s69xx/tstlm4f120.yml
@@ -28,8 +28,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: