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, 63 insertions, 62 deletions

diff --git a/spec/build/bsps/powerpc/gen5200/abi.yml b/spec/build/bsps/powerpc/gen5200/abi.yml
index 29fd9942f9..6d5a558a08 100644
--- a/spec/build/bsps/powerpc/gen5200/abi.yml
+++ b/spec/build/bsps/powerpc/gen5200/abi.yml
@@ -7,11 +7,12 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=603e
-- -mstrict-align
-- -meabi
-- -msdata=sysv
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=603e
+  - -mstrict-align
+  - -meabi
+  - -msdata=sysv
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optbenchirq.yml b/spec/build/bsps/powerpc/gen5200/optbenchirq.yml
index 3ade789573..ad8ad031ab 100644
--- a/spec/build/bsps/powerpc/gen5200/optbenchirq.yml
+++ b/spec/build/bsps/powerpc/gen5200/optbenchirq.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 set to !0, enable code to benchmark IRQ processing.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optenirqnest.yml b/spec/build/bsps/powerpc/gen5200/optenirqnest.yml
index 2dfcefb5ea..073c451ae4 100644
--- a/spec/build/bsps/powerpc/gen5200/optenirqnest.yml
+++ b/spec/build/bsps/powerpc/gen5200/optenirqnest.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
-  - powerpc/icecube
+default:
+- enabled-by: powerpc/icecube
+  value: false
+- enabled-by: true
+  value: true
 description: |
   If set to !0, allow nested IRQ processing.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optgpiomsk.yml b/spec/build/bsps/powerpc/gen5200/optgpiomsk.yml
index 7c05efb92c..04b45df054 100644
--- a/spec/build/bsps/powerpc/gen5200/optgpiomsk.yml
+++ b/spec/build/bsps/powerpc/gen5200/optgpiomsk.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x330f0f77
-default-by-variant:
-- value: 0x037f3f07
-  variants:
-  - powerpc/pm520_ze30
+default:
+- enabled-by: powerpc/pm520_ze30
+  value: 0x037f3f07
+- enabled-by: true
+  value: 0x330f0f77
 description: |
   Defines the bits cleared in the MPC5200 GPIOPCR register during
   initialization.  Must match the hardware requirements.  Must be consistent
diff --git a/spec/build/bsps/powerpc/gen5200/optgpioval.yml b/spec/build/bsps/powerpc/gen5200/optgpioval.yml
index ffcef9199d..39543687d5 100644
--- a/spec/build/bsps/powerpc/gen5200/optgpioval.yml
+++ b/spec/build/bsps/powerpc/gen5200/optgpioval.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x01050444
-default-by-variant:
-- value: 0x01552104
-  variants:
-  - powerpc/pm520_ze30
+default:
+- enabled-by: powerpc/pm520_ze30
+  value: 0x01552104
+- enabled-by: true
+  value: 0x01050444
 description: |
   Defines the bits set in the MPC5200 GPIOPCR register during initialization.
   Must match the hardware requirements.  Must be consistent with
diff --git a/spec/build/bsps/powerpc/gen5200/opticecub.yml b/spec/build/bsps/powerpc/gen5200/opticecub.yml
index c93eafa7b2..429a24b681 100644
--- a/spec/build/bsps/powerpc/gen5200/opticecub.yml
+++ b/spec/build/bsps/powerpc/gen5200/opticecub.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/icecube
+default:
+- enabled-by: powerpc/icecube
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable settings for IceCube
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optpm520cr825.yml b/spec/build/bsps/powerpc/gen5200/optpm520cr825.yml
index 72d96a0696..8b2450db44 100644
--- a/spec/build/bsps/powerpc/gen5200/optpm520cr825.yml
+++ b/spec/build/bsps/powerpc/gen5200/optpm520cr825.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/pm520_cr825
+default:
+- enabled-by: powerpc/pm520_cr825
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable settings for PM520 CR825
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optpm520ze30.yml b/spec/build/bsps/powerpc/gen5200/optpm520ze30.yml
index 8a285a99aa..0c8bdafacf 100644
--- a/spec/build/bsps/powerpc/gen5200/optpm520ze30.yml
+++ b/spec/build/bsps/powerpc/gen5200/optpm520ze30.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/pm520_ze30
+default:
+- enabled-by: powerpc/pm520_ze30
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable settings for PM520 ZE30
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optprintkminor.yml b/spec/build/bsps/powerpc/gen5200/optprintkminor.yml
index fd101467b9..b563d84cab 100644
--- a/spec/build/bsps/powerpc/gen5200/optprintkminor.yml
+++ b/spec/build/bsps/powerpc/gen5200/optprintkminor.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: |
   console minor number used by printk()
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optpscgps.yml b/spec/build/bsps/powerpc/gen5200/optpscgps.yml
index 1a80a6b34e..165b24f44a 100644
--- a/spec/build/bsps/powerpc/gen5200/optpscgps.yml
+++ b/spec/build/bsps/powerpc/gen5200/optpscgps.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: |
   PSC index for GPS module, if defined results in '/dev/gps'
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optsinglechar.yml b/spec/build/bsps/powerpc/gen5200/optsinglechar.yml
index 26f3e4b8a6..b13cfcc04a 100644
--- a/spec/build/bsps/powerpc/gen5200/optsinglechar.yml
+++ b/spec/build/bsps/powerpc/gen5200/optsinglechar.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: |
   enable single character mode for the PSC console driver
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optuartmsk.yml b/spec/build/bsps/powerpc/gen5200/optuartmsk.yml
index fd960232ef..e5d4cf67fc 100644
--- a/spec/build/bsps/powerpc/gen5200/optuartmsk.yml
+++ b/spec/build/bsps/powerpc/gen5200/optuartmsk.yml
@@ -5,17 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000001
-default-by-variant:
-- value: 0x00000039
-  variants:
-  - powerpc/pm520_ze30
-- value: 0x00000007
-  variants:
-  - powerpc/pm520_cr825
-- value: 0x00000001
-  variants:
-  - powerpc/icecube
+default:
+- enabled-by: powerpc/pm520_ze30
+  value: 0x00000039
+- enabled-by: powerpc/pm520_cr825
+  value: 0x00000007
+- enabled-by: true
+  value: 0x00000001
 description: |
   bit mask to specify the UARTS (PSCs), which should be enabled on this board.  Must match the hardware requirements. PSC1 corresponds to the LSB
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optuartstermirq.yml b/spec/build/bsps/powerpc/gen5200/optuartstermirq.yml
index 219d19a564..fefe93c610 100644
--- a/spec/build/bsps/powerpc/gen5200/optuartstermirq.yml
+++ b/spec/build/bsps/powerpc/gen5200/optuartstermirq.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: |
   enable interrupt support for the PSC console driver
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen5200/optuboot.yml b/spec/build/bsps/powerpc/gen5200/optuboot.yml
index 4d44060774..8699abd092 100644
--- a/spec/build/bsps/powerpc/gen5200/optuboot.yml
+++ b/spec/build/bsps/powerpc/gen5200/optuboot.yml
@@ -5,15 +5,14 @@ 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:
   - powerpc/pm520_cr825
   - powerpc/pm520_ze30
-- value: true
-  variants:
   - powerpc/icecube
+  value: true
+- enabled-by: true
+  value: false
 description: |
   enable U-Boot startup
 enabled-by: true