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.

14 files changed, 61 insertions, 55 deletions

diff --git a/spec/build/bsps/sparc/erc32/abi.yml b/spec/build/bsps/sparc/erc32/abi.yml
index f8ea9fb8da..13fc6fe45b 100644
--- a/spec/build/bsps/sparc/erc32/abi.yml
+++ b/spec/build/bsps/sparc/erc32/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=cypress
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cypress
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc/erc32/optconirq.yml b/spec/build/bsps/sparc/erc32/optconirq.yml
index df25d621b4..314d022a44 100644
--- a/spec/build/bsps/sparc/erc32/optconirq.yml
+++ b/spec/build/bsps/sparc/erc32/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 erc32 console driver can operate in either polled or interrupt mode.  Under the simulator (especially when FAST_UART is defined), polled seems to operate better. It is common for a task to print a line (like the end of test message) and then exit.  In this case, the program returns control to the simulator command line before the program has even queued the output to the uart.  Thus sis has no chance of getting the data out.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/erc32/optpwrdwnhlt.yml b/spec/build/bsps/sparc/erc32/optpwrdwnhlt.yml
index 6627a5b071..1c35dc61cc 100644
--- a/spec/build/bsps/sparc/erc32/optpwrdwnhlt.yml
+++ b/spec/build/bsps/sparc/erc32/optpwrdwnhlt.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: |
   If defined, CPU is spinning on fatal exit. Otherwise generate system error which will hand over to debugger, simulator, etc.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon2/abi.yml b/spec/build/bsps/sparc/leon2/abi.yml
index 21fe1b77ca..22a699dadb 100644
--- a/spec/build/bsps/sparc/leon2/abi.yml
+++ b/spec/build/bsps/sparc/leon2/abi.yml
@@ -7,13 +7,13 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=leon
-default-by-variant:
-- value:
+- enabled-by: sparc/at697f
+  value:
   - -mcpu=leon
   - -mfix-at697f
-  variants:
-  - sparc/at697f
+- enabled-by: true
+  value:
+  - -mcpu=leon
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon2/optconirq.yml b/spec/build/bsps/sparc/leon2/optconirq.yml
index 4163b30aff..1bc1912391 100644
--- a/spec/build/bsps/sparc/leon2/optconirq.yml
+++ b/spec/build/bsps/sparc/leon2/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 leon2 console driver can operate in either polled or interrupt mode.  Under the simulator (especially when FAST_UART is defined), polled seems to operate better. It is common for a task to print a line (like the end of test message) and then exit.  In this case, the program returns control to the simulator command line before the program has even queued the output to the uart.  Thus sis has no chance of getting the data out.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon2/optpwrdwnhlt.yml b/spec/build/bsps/sparc/leon2/optpwrdwnhlt.yml
index 6627a5b071..1c35dc61cc 100644
--- a/spec/build/bsps/sparc/leon2/optpwrdwnhlt.yml
+++ b/spec/build/bsps/sparc/leon2/optpwrdwnhlt.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: |
   If defined, CPU is spinning on fatal exit. Otherwise generate system error which will hand over to debugger, simulator, etc.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon3/abi.yml b/spec/build/bsps/sparc/leon3/abi.yml
index b725d5de48..5117e3e555 100644
--- a/spec/build/bsps/sparc/leon3/abi.yml
+++ b/spec/build/bsps/sparc/leon3/abi.yml
@@ -7,23 +7,21 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=leon3
-default-by-variant:
-- value:
+- enabled-by: sparc/ut700
+  value:
   - -mcpu=leon3
   - -mfix-ut700
-  variants:
-  - sparc/ut700
-- value:
+- enabled-by: sparc/ut699
+  value:
   - -mcpu=leon
   - -mfix-ut699
-  variants:
-  - sparc/ut699
-- value:
+- enabled-by: sparc/gr712rc
+  value:
   - -mcpu=leon3
   - -mfix-gr712rc
-  variants:
-  - sparc/gr712rc
+- enabled-by: true
+  value:
+  - -mcpu=leon3
 description: |
   ABI flags
 enabled-by:
diff --git a/spec/build/bsps/sparc/leon3/abiclang.yml b/spec/build/bsps/sparc/leon3/abiclang.yml
index 6c9646e7cd..577129762c 100644
--- a/spec/build/bsps/sparc/leon3/abiclang.yml
+++ b/spec/build/bsps/sparc/leon3/abiclang.yml
@@ -7,26 +7,23 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
 default:
-- -mcpu=leon3
-default-by-variant:
-- value:
+- enabled-by: sparc/ut700
+  value:
   - -mcpu=leon3
   - -mfix-ut700
-  variants:
-  - sparc/ut700
-- value:
+- enabled-by: sparc/ut699
+  value:
   - -mcpu=leon
   - -mfix-ut699
-  variants:
-  - sparc/ut699
-- value:
+- enabled-by: sparc/gr712rc
+  value:
   - -mcpu=gr712rc
-  variants:
-  - sparc/gr712rc
-- value:
+- enabled-by: sparc/gr740
+  value:
   - -mcpu=gr740
-  variants:
-  - sparc/gr740
+- enabled-by: true
+  value:
+  - -mcpu=leon3
 description: |
   ABI flags
 enabled-by:
diff --git a/spec/build/bsps/sparc/leon3/optconirq.yml b/spec/build/bsps/sparc/leon3/optconirq.yml
index 2278f00ef3..7083b47892 100644
--- a/spec/build/bsps/sparc/leon3/optconirq.yml
+++ b/spec/build/bsps/sparc/leon3/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 leon3 console driver can operate in either polled or interrupt mode.  Under the simulator (especially when FAST_UART is defined), polled seems to operate better.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon3/optleon3smp.yml b/spec/build/bsps/sparc/leon3/optleon3smp.yml
index c78929c198..f86d40c16a 100644
--- a/spec/build/bsps/sparc/leon3/optleon3smp.yml
+++ b/spec/build/bsps/sparc/leon3/optleon3smp.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: |
   Always defined when on a LEON3 to enable the LEON3 support for determining the CPU core number in an SMP configuration.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon3/optpwrdwnhlt.yml b/spec/build/bsps/sparc/leon3/optpwrdwnhlt.yml
index 8923870017..1ddb90bc10 100644
--- a/spec/build/bsps/sparc/leon3/optpwrdwnhlt.yml
+++ b/spec/build/bsps/sparc/leon3/optpwrdwnhlt.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: |
   If defined, CPU is powered down on fatal exit. Otherwise generate system error which will hand over to debugger, simulator, etc.
 enabled-by: true
diff --git a/spec/build/bsps/sparc64/niagara/abi.yml b/spec/build/bsps/sparc64/niagara/abi.yml
index d8aadc1831..eae575e1d9 100644
--- a/spec/build/bsps/sparc64/niagara/abi.yml
+++ b/spec/build/bsps/sparc64/niagara/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -DSUN4V
-- -mcpu=niagara
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -DSUN4V
+  - -mcpu=niagara
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc64/usiii/abi.yml b/spec/build/bsps/sparc64/usiii/abi.yml
index 77dce75223..3b072388cd 100644
--- a/spec/build/bsps/sparc64/usiii/abi.yml
+++ b/spec/build/bsps/sparc64/usiii/abi.yml
@@ -7,10 +7,11 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -DSUN4U
-- -DUS3
-- -mcpu=ultrasparc3
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -DSUN4U
+  - -DUS3
+  - -mcpu=ultrasparc3
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc64/usiii/optclkfastidle.yml b/spec/build/bsps/sparc64/usiii/optclkfastidle.yml
index 5aed542b4b..3fd064cc0a 100644
--- a/spec/build/bsps/sparc64/usiii/optclkfastidle.yml
+++ b/spec/build/bsps/sparc64/usiii/optclkfastidle.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: |
   If defined, speed up the clock ticks while the idle task is running so time spent in the idle task is minimized.  This significantly reduces the wall time required to execute the RTEMS test suites.
 enabled-by: true