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.

9 files changed, 29 insertions, 25 deletions

diff --git a/spec/build/bsps/arm/csb337/abi.yml b/spec/build/bsps/arm/csb337/abi.yml
index ccf0bc7ea2..c19f7eb9ff 100644
--- a/spec/build/bsps/arm/csb337/abi.yml
+++ b/spec/build/bsps/arm/csb337/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=arm920
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=arm920
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optcsb637.yml b/spec/build/bsps/arm/csb337/optcsb637.yml
index 5db48e1f0a..af6b0b5790 100644
--- a/spec/build/bsps/arm/csb337/optcsb637.yml
+++ b/spec/build/bsps/arm/csb337/optcsb637.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/kit637_v6
-- value: true
-  variants:
   - arm/csb637
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, this indicates that the BSP is being built for the csb637 variant.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenlcd.yml b/spec/build/bsps/arm/csb337/optenlcd.yml
index 40617f7c2f..dc1f3b3786 100644
--- a/spec/build/bsps/arm/csb337/optenlcd.yml
+++ b/spec/build/bsps/arm/csb337/optenlcd.yml
@@ -6,11 +6,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/kit637_v6
+default:
+- enabled-by: true
+  value: false
 description: |
   If defined, enable use of the SED1356 controller and LCD.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenumon.yml b/spec/build/bsps/arm/csb337/optenumon.yml
index 8286e0fa4b..518fccc624 100644
--- a/spec/build/bsps/arm/csb337/optenumon.yml
+++ b/spec/build/bsps/arm/csb337/optenumon.yml
@@ -6,8 +6,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: |
   If defined, enable use of the uMon console.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenumoncon.yml b/spec/build/bsps/arm/csb337/optenumoncon.yml
index e2ca577184..7c53ee9139 100644
--- a/spec/build/bsps/arm/csb337/optenumoncon.yml
+++ b/spec/build/bsps/arm/csb337/optenumoncon.yml
@@ -6,8 +6,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: |
   If defined, enable use of the MicroMonitor console device.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart0.yml b/spec/build/bsps/arm/csb337/optenusart0.yml
index cd968f8dbc..410e04eb54 100644
--- a/spec/build/bsps/arm/csb337/optenusart0.yml
+++ b/spec/build/bsps/arm/csb337/optenusart0.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: |
   If defined, enable use of the USART 0.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart1.yml b/spec/build/bsps/arm/csb337/optenusart1.yml
index 963d2a9742..398cce4a47 100644
--- a/spec/build/bsps/arm/csb337/optenusart1.yml
+++ b/spec/build/bsps/arm/csb337/optenusart1.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: |
   If defined, enable use of the USART 1.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart2.yml b/spec/build/bsps/arm/csb337/optenusart2.yml
index d4ae1fe756..bece1ac63a 100644
--- a/spec/build/bsps/arm/csb337/optenusart2.yml
+++ b/spec/build/bsps/arm/csb337/optenusart2.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: |
   If defined, enable use of the USART 2.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart3.yml b/spec/build/bsps/arm/csb337/optenusart3.yml
index 200824f3e3..f73381e338 100644
--- a/spec/build/bsps/arm/csb337/optenusart3.yml
+++ b/spec/build/bsps/arm/csb337/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: |
   If defined, enable use of the USART 3.
 enabled-by: true