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.

6 files changed, 22 insertions, 20 deletions

diff --git a/spec/build/bsps/arm/beagle/abi.yml b/spec/build/bsps/arm/beagle/abi.yml
index 80b94605e7..55465d36a9 100644
--- a/spec/build/bsps/arm/beagle/abi.yml
+++ b/spec/build/bsps/arm/beagle/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=cortex-a8
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a8
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optam335x.yml b/spec/build/bsps/arm/beagle/optam335x.yml
index 6641cef403..00c4c328d9 100644
--- a/spec/build/bsps/arm/beagle/optam335x.yml
+++ b/spec/build/bsps/arm/beagle/optam335x.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/beagleboneblack
   - arm/beaglebonewhite
+  value: true
+- enabled-by: true
+  value: false
 description: |
   true if SOC is AM335X
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optconbaud.yml b/spec/build/bsps/arm/beagle/optconbaud.yml
index 9c3eaff15b..8441947ce8 100644
--- a/spec/build/bsps/arm/beagle/optconbaud.yml
+++ b/spec/build/bsps/arm/beagle/optconbaud.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: |
   initial baud for console UART
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optconpoll.yml b/spec/build/bsps/arm/beagle/optconpoll.yml
index 1717792bb8..acb67e28f3 100644
--- a/spec/build/bsps/arm/beagle/optconpoll.yml
+++ b/spec/build/bsps/arm/beagle/optconpoll.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: |
   polled console i/o (e.g. to run testsuite)
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optdebug.yml b/spec/build/bsps/arm/beagle/optdebug.yml
index 8a5dc7ee96..05ceae5818 100644
--- a/spec/build/bsps/arm/beagle/optdebug.yml
+++ b/spec/build/bsps/arm/beagle/optdebug.yml
@@ -5,12 +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/beagleboneblack
-  - arm/beaglebonewhite
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable BBB debug
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optdm3730.yml b/spec/build/bsps/arm/beagle/optdm3730.yml
index 4161ee29f1..6d7d495b67 100644
--- a/spec/build/bsps/arm/beagle/optdm3730.yml
+++ b/spec/build/bsps/arm/beagle/optdm3730.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/beagleboardorig
   - arm/beagleboardxm
+  value: true
+- enabled-by: true
+  value: false
 description: |
   true if SOC is DM3730
 enabled-by: true