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.

12 files changed, 36 insertions, 24 deletions

diff --git a/spec/build/bsps/bfin/TLL6527M/abi.yml b/spec/build/bsps/bfin/TLL6527M/abi.yml
index 861623f2a5..07270aa8ab 100644
--- a/spec/build/bsps/bfin/TLL6527M/abi.yml
+++ b/spec/build/bsps/bfin/TLL6527M/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=bf527
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=bf527
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/bfin/TLL6527M/optconbaud.yml b/spec/build/bsps/bfin/TLL6527M/optconbaud.yml
index c1823caa93..691a536827 100644
--- a/spec/build/bsps/bfin/TLL6527M/optconbaud.yml
+++ b/spec/build/bsps/bfin/TLL6527M/optconbaud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 9600
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 9600
 description: |
   The baudrate of the console uart.
 enabled-by: true
diff --git a/spec/build/bsps/bfin/TLL6527M/optconirq.yml b/spec/build/bsps/bfin/TLL6527M/optconirq.yml
index 1557437cae..9e9c4a3e29 100644
--- a/spec/build/bsps/bfin/TLL6527M/optconirq.yml
+++ b/spec/build/bsps/bfin/TLL6527M/optconirq.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: |
   The console driver can operate in either polled or interrupt mode.
 enabled-by: true
diff --git a/spec/build/bsps/bfin/TLL6527M/optirqtbl.yml b/spec/build/bsps/bfin/TLL6527M/optirqtbl.yml
index 925753a83b..74911f0b68 100644
--- a/spec/build/bsps/bfin/TLL6527M/optirqtbl.yml
+++ b/spec/build/bsps/bfin/TLL6527M/optirqtbl.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: |
   Select if INTERRUPT use table or link list
 enabled-by: true
diff --git a/spec/build/bsps/bfin/TLL6527M/optskyeye.yml b/spec/build/bsps/bfin/TLL6527M/optskyeye.yml
index f6b9655e57..6ec951a6de 100644
--- a/spec/build/bsps/bfin/TLL6527M/optskyeye.yml
+++ b/spec/build/bsps/bfin/TLL6527M/optskyeye.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: |
   (BSP--Skyeye) If defined, disable features which are not supported on Skyeye.
 enabled-by: true
diff --git a/spec/build/bsps/bfin/TLL6527M/optuartdma.yml b/spec/build/bsps/bfin/TLL6527M/optuartdma.yml
index 915333096d..e648d6bcb2 100644
--- a/spec/build/bsps/bfin/TLL6527M/optuartdma.yml
+++ b/spec/build/bsps/bfin/TLL6527M/optuartdma.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: |
   The uart driver can operate in dma mode with interrupts.  Set to 1 if DMA operation is required
 enabled-by: true
diff --git a/spec/build/bsps/bfin/bf537Stamp/abi.yml b/spec/build/bsps/bfin/bf537Stamp/abi.yml
index 530e7a5d14..d47c609e80 100644
--- a/spec/build/bsps/bfin/bf537Stamp/abi.yml
+++ b/spec/build/bsps/bfin/bf537Stamp/abi.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: []
-default-by-variant: []
+default:
+- enabled-by: true
+  value: []
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/bfin/bf537Stamp/optconirq.yml b/spec/build/bsps/bfin/bf537Stamp/optconirq.yml
index 683469c931..5f03ab0e47 100644
--- a/spec/build/bsps/bfin/bf537Stamp/optconirq.yml
+++ b/spec/build/bsps/bfin/bf537Stamp/optconirq.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0
 description: |
   The console driver can operate in either polled or interrupt mode.
 enabled-by: true
diff --git a/spec/build/bsps/bfin/bf537Stamp/optskyeye.yml b/spec/build/bsps/bfin/bf537Stamp/optskyeye.yml
index f6b9655e57..6ec951a6de 100644
--- a/spec/build/bsps/bfin/bf537Stamp/optskyeye.yml
+++ b/spec/build/bsps/bfin/bf537Stamp/optskyeye.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: |
   (BSP--Skyeye) If defined, disable features which are not supported on Skyeye.
 enabled-by: true
diff --git a/spec/build/bsps/bfin/eZKit533/abi.yml b/spec/build/bsps/bfin/eZKit533/abi.yml
index 530e7a5d14..d47c609e80 100644
--- a/spec/build/bsps/bfin/eZKit533/abi.yml
+++ b/spec/build/bsps/bfin/eZKit533/abi.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: []
-default-by-variant: []
+default:
+- enabled-by: true
+  value: []
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/bfin/eZKit533/optconirq.yml b/spec/build/bsps/bfin/eZKit533/optconirq.yml
index 683469c931..5f03ab0e47 100644
--- a/spec/build/bsps/bfin/eZKit533/optconirq.yml
+++ b/spec/build/bsps/bfin/eZKit533/optconirq.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0
 description: |
   The console driver can operate in either polled or interrupt mode.
 enabled-by: true
diff --git a/spec/build/bsps/bfin/eZKit533/optskyeye.yml b/spec/build/bsps/bfin/eZKit533/optskyeye.yml
index f6b9655e57..6ec951a6de 100644
--- a/spec/build/bsps/bfin/eZKit533/optskyeye.yml
+++ b/spec/build/bsps/bfin/eZKit533/optskyeye.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: |
   (BSP--Skyeye) If defined, disable features which are not supported on Skyeye.
 enabled-by: true