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.

18 files changed, 71 insertions, 63 deletions

diff --git a/spec/build/bsps/arm/stm32f4/abi.yml b/spec/build/bsps/arm/stm32f4/abi.yml
index 3098d8597b..3d8cf52ec9 100644
--- a/spec/build/bsps/arm/stm32f4/abi.yml
+++ b/spec/build/bsps/arm/stm32f4/abi.yml
@@ -7,16 +7,16 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=cortex-m4
-- -mthumb
-- -mfloat-abi=hard
-- -mfpu=auto
-default-by-variant:
-- value:
+- enabled-by: arm/stm32f105rc
+  value:
   - -mthumb
   - -mcpu=cortex-m3
-  variants:
-  - arm/stm32f105rc
+- enabled-by: true
+  value:
+  - -mcpu=cortex-m4
+  - -mthumb
+  - -mfloat-abi=hard
+  - -mfpu=auto
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/opteni2c1.yml b/spec/build/bsps/arm/stm32f4/opteni2c1.yml
index ab8dd78926..dbb47cf63a 100644
--- a/spec/build/bsps/arm/stm32f4/opteni2c1.yml
+++ b/spec/build/bsps/arm/stm32f4/opteni2c1.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/stm32f105rc
+default:
+- enabled-by: arm/stm32f105rc
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable I2C 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/opteni2c2.yml b/spec/build/bsps/arm/stm32f4/opteni2c2.yml
index d4ef7328e1..4206c3e619 100644
--- a/spec/build/bsps/arm/stm32f4/opteni2c2.yml
+++ b/spec/build/bsps/arm/stm32f4/opteni2c2.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 I2C 2
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optenuart4.yml b/spec/build/bsps/arm/stm32f4/optenuart4.yml
index 5bf266707f..adff97c933 100644
--- a/spec/build/bsps/arm/stm32f4/optenuart4.yml
+++ b/spec/build/bsps/arm/stm32f4/optenuart4.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 4
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optenuart5.yml b/spec/build/bsps/arm/stm32f4/optenuart5.yml
index 21f1e6f963..ed52ec5b2d 100644
--- a/spec/build/bsps/arm/stm32f4/optenuart5.yml
+++ b/spec/build/bsps/arm/stm32f4/optenuart5.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 5
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optenusart1.yml b/spec/build/bsps/arm/stm32f4/optenusart1.yml
index 9fd8f99af2..cdb6a3b53c 100644
--- a/spec/build/bsps/arm/stm32f4/optenusart1.yml
+++ b/spec/build/bsps/arm/stm32f4/optenusart1.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 USART 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optenusart2.yml b/spec/build/bsps/arm/stm32f4/optenusart2.yml
index d9dd3a3d22..8bae93c1d8 100644
--- a/spec/build/bsps/arm/stm32f4/optenusart2.yml
+++ b/spec/build/bsps/arm/stm32f4/optenusart2.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 USART 2
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optenusart3.yml b/spec/build/bsps/arm/stm32f4/optenusart3.yml
index 3cc11ba79b..feb8c1f429 100644
--- a/spec/build/bsps/arm/stm32f4/optenusart3.yml
+++ b/spec/build/bsps/arm/stm32f4/optenusart3.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 USART 3
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optenusart6.yml b/spec/build/bsps/arm/stm32f4/optenusart6.yml
index 4e20fb4317..1755749163 100644
--- a/spec/build/bsps/arm/stm32f4/optenusart6.yml
+++ b/spec/build/bsps/arm/stm32f4/optenusart6.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 USART 6
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optf10xxx.yml b/spec/build/bsps/arm/stm32f4/optf10xxx.yml
index a1cc76ff37..2acf8248df 100644
--- a/spec/build/bsps/arm/stm32f4/optf10xxx.yml
+++ b/spec/build/bsps/arm/stm32f4/optf10xxx.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/stm32f105rc
+default:
+- enabled-by: arm/stm32f105rc
+  value: true
+- enabled-by: true
+  value: false
 description: |
   Chip belongs to the STM32F10XXX family.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optf4xxxx.yml b/spec/build/bsps/arm/stm32f4/optf4xxxx.yml
index 891aacc3c3..a7d4aa9003 100644
--- a/spec/build/bsps/arm/stm32f4/optf4xxxx.yml
+++ b/spec/build/bsps/arm/stm32f4/optf4xxxx.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/stm32f4
+default:
+- enabled-by: arm/stm32f4
+  value: true
+- enabled-by: true
+  value: false
 description: |
   Chip belongs to the STM32F4XXXX family.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/opthclk.yml b/spec/build/bsps/arm/stm32f4/opthclk.yml
index b827fffe33..dc1f69b81e 100644
--- a/spec/build/bsps/arm/stm32f4/opthclk.yml
+++ b/spec/build/bsps/arm/stm32f4/opthclk.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 16000000
-default-by-variant:
-- value: 8000000
-  variants:
-  - arm/stm32f105rc
+default:
+- enabled-by: arm/stm32f105rc
+  value: 8000000
+- enabled-by: true
+  value: 16000000
 description: |
   HCLK frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optoschse.yml b/spec/build/bsps/arm/stm32f4/optoschse.yml
index 2b1dad620e..047b5d98a9 100644
--- a/spec/build/bsps/arm/stm32f4/optoschse.yml
+++ b/spec/build/bsps/arm/stm32f4/optoschse.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 8000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 8000000
 description: |
   HSE oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optpclk1.yml b/spec/build/bsps/arm/stm32f4/optpclk1.yml
index 79aafa89a9..493534ad1c 100644
--- a/spec/build/bsps/arm/stm32f4/optpclk1.yml
+++ b/spec/build/bsps/arm/stm32f4/optpclk1.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 16000000
-default-by-variant:
-- value: 8000000
-  variants:
-  - arm/stm32f105rc
+default:
+- enabled-by: arm/stm32f105rc
+  value: 8000000
+- enabled-by: true
+  value: 16000000
 description: |
   PCLK1 frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optpclk2.yml b/spec/build/bsps/arm/stm32f4/optpclk2.yml
index 43ce9f9c04..ab25ee194b 100644
--- a/spec/build/bsps/arm/stm32f4/optpclk2.yml
+++ b/spec/build/bsps/arm/stm32f4/optpclk2.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 16000000
-default-by-variant:
-- value: 8000000
-  variants:
-  - arm/stm32f105rc
+default:
+- enabled-by: arm/stm32f105rc
+  value: 8000000
+- enabled-by: true
+  value: 16000000
 description: |
   PCLK2 frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optsysclk.yml b/spec/build/bsps/arm/stm32f4/optsysclk.yml
index 9dd081d475..d70078e2f5 100644
--- a/spec/build/bsps/arm/stm32f4/optsysclk.yml
+++ b/spec/build/bsps/arm/stm32f4/optsysclk.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 16000000
-default-by-variant:
-- value: 8000000
-  variants:
-  - arm/stm32f105rc
+default:
+- enabled-by: arm/stm32f105rc
+  value: 8000000
+- enabled-by: true
+  value: 16000000
 description: |
   SYSCLK frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optusartbaud.yml b/spec/build/bsps/arm/stm32f4/optusartbaud.yml
index b102e37eb6..8d4462cacd 100644
--- a/spec/build/bsps/arm/stm32f4/optusartbaud.yml
+++ b/spec/build/bsps/arm/stm32f4/optusartbaud.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 USARTs
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/tststm32f105rc.yml b/spec/build/bsps/arm/stm32f4/tststm32f105rc.yml
index c7405f76dd..675af7406f 100644
--- a/spec/build/bsps/arm/stm32f4/tststm32f105rc.yml
+++ b/spec/build/bsps/arm/stm32f4/tststm32f105rc.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: