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.

5 files changed, 20 insertions, 16 deletions

diff --git a/spec/build/bsps/powerpc/psim/abi.yml b/spec/build/bsps/powerpc/psim/abi.yml
index b9b2ae3002..bc22f5c872 100644
--- a/spec/build/bsps/powerpc/psim/abi.yml
+++ b/spec/build/bsps/powerpc/psim/abi.yml
@@ -7,11 +7,12 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -Dppc603e
-- -meabi
-- -mcpu=603e
-- -msdata=sysv
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Dppc603e
+  - -meabi
+  - -mcpu=603e
+  - -msdata=sysv
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optclkfastidle.yml b/spec/build/bsps/powerpc/psim/optclkfastidle.yml
index df86867fa7..8e96cc9a15 100644
--- a/spec/build/bsps/powerpc/psim/optclkfastidle.yml
+++ b/spec/build/bsps/powerpc/psim/optclkfastidle.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/psim
+default:
+- enabled-by: powerpc/psim
+  value: true
+- enabled-by: true
+  value: false
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optsbrk.yml b/spec/build/bsps/powerpc/psim/optsbrk.yml
index 05a1acd75f..fa1f5129bc 100644
--- a/spec/build/bsps/powerpc/psim/optsbrk.yml
+++ b/spec/build/bsps/powerpc/psim/optsbrk.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 then the BSP may reduce the available memory size initially. This can be useful for debugging (reduce the core size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).  Note that the policy can still be defined by the application (see sbrk.c, BSP_sbrk_policy). By undefining CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed and a little memory is saved.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optsprg.yml b/spec/build/bsps/powerpc/psim/optsprg.yml
index 89f5b47135..1c530ba45e 100644
--- a/spec/build/bsps/powerpc/psim/optsprg.yml
+++ b/spec/build/bsps/powerpc/psim/optsprg.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, then the PowerPC specific code in RTEMS will use some of the special purpose registers to slightly optimize interrupt response time.  The use of these registers can conflict with other tools like debuggers.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optvecbase.yml b/spec/build/bsps/powerpc/psim/optvecbase.yml
index 65aa4099c4..b5d3199f30 100644
--- a/spec/build/bsps/powerpc/psim/optvecbase.yml
+++ b/spec/build/bsps/powerpc/psim/optvecbase.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0xfff00100
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0xfff00100
 description: |
   This defines the base address of the exception table.  NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.
 enabled-by: true