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.

10 files changed, 40 insertions, 32 deletions

diff --git a/spec/build/bsps/mips/csb350/abi.yml b/spec/build/bsps/mips/csb350/abi.yml
index 049de557ad..23bee7abfc 100644
--- a/spec/build/bsps/mips/csb350/abi.yml
+++ b/spec/build/bsps/mips/csb350/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mips32
-- -G0
-- -msoft-float
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mips32
+  - -G0
+  - -msoft-float
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/mips/hurricane/abi.yml b/spec/build/bsps/mips/hurricane/abi.yml
index 79408e4eb3..46d089e3cb 100644
--- a/spec/build/bsps/mips/hurricane/abi.yml
+++ b/spec/build/bsps/mips/hurricane/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mips3
-- -G0
-- -EL
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mips3
+  - -G0
+  - -EL
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/mips/hurricane/optrm52xx.yml b/spec/build/bsps/mips/hurricane/optrm52xx.yml
index 1fc3d504e4..931f93f968 100644
--- a/spec/build/bsps/mips/hurricane/optrm52xx.yml
+++ b/spec/build/bsps/mips/hurricane/optrm52xx.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: |
   This BSP has a RM52xx compatible CPU.
 enabled-by: true
diff --git a/spec/build/bsps/mips/hurricane/optusc320.yml b/spec/build/bsps/mips/hurricane/optusc320.yml
index 74ddd56d4f..95a912be10 100644
--- a/spec/build/bsps/mips/hurricane/optusc320.yml
+++ b/spec/build/bsps/mips/hurricane/optusc320.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: |
   This BSP has a V3 USC320 system controller chip.
 enabled-by: true
diff --git a/spec/build/bsps/mips/jmr3904/abi.yml b/spec/build/bsps/mips/jmr3904/abi.yml
index c46d4f8c3e..f761e856ac 100644
--- a/spec/build/bsps/mips/jmr3904/abi.yml
+++ b/spec/build/bsps/mips/jmr3904/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -march=r3900
-- -Wa,-xgot
-- -G0
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -march=r3900
+  - -Wa,-xgot
+  - -G0
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/mips/jmr3904/tstjmr3904.yml b/spec/build/bsps/mips/jmr3904/tstjmr3904.yml
index 1f4c2ef32a..4a8679a52d 100644
--- a/spec/build/bsps/mips/jmr3904/tstjmr3904.yml
+++ b/spec/build/bsps/mips/jmr3904/tstjmr3904.yml
@@ -8,8 +8,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/mips/malta/abi.yml b/spec/build/bsps/mips/malta/abi.yml
index 99038088b2..bc0936cbae 100644
--- a/spec/build/bsps/mips/malta/abi.yml
+++ b/spec/build/bsps/mips/malta/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -march=24kf1_1
-- -Wa,-xgot
-- -G0
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -march=24kf1_1
+  - -Wa,-xgot
+  - -G0
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/mips/rbtx4925/abi.yml b/spec/build/bsps/mips/rbtx4925/abi.yml
index 79408e4eb3..46d089e3cb 100644
--- a/spec/build/bsps/mips/rbtx4925/abi.yml
+++ b/spec/build/bsps/mips/rbtx4925/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mips3
-- -G0
-- -EL
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mips3
+  - -G0
+  - -EL
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/mips/rbtx4925/opttx49xx.yml b/spec/build/bsps/mips/rbtx4925/opttx49xx.yml
index a9e7f96fe2..6921be472f 100644
--- a/spec/build/bsps/mips/rbtx4925/opttx49xx.yml
+++ b/spec/build/bsps/mips/rbtx4925/opttx49xx.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: |
   This BSP has a RM52xx compatible CPU.
 enabled-by: true
diff --git a/spec/build/bsps/mips/rbtx4938/abi.yml b/spec/build/bsps/mips/rbtx4938/abi.yml
index 79408e4eb3..46d089e3cb 100644
--- a/spec/build/bsps/mips/rbtx4938/abi.yml
+++ b/spec/build/bsps/mips/rbtx4938/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mips3
-- -G0
-- -EL
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mips3
+  - -G0
+  - -EL
 description: |
   ABI flags
 enabled-by: true