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, 73 insertions, 79 deletions

diff --git a/spec/build/bsps/powerpc/gen83xx/abi.yml b/spec/build/bsps/powerpc/gen83xx/abi.yml
index 003f7c77d5..d4675ca5f5 100644
--- a/spec/build/bsps/powerpc/gen83xx/abi.yml
+++ b/spec/build/bsps/powerpc/gen83xx/abi.yml
@@ -7,11 +7,12 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=603e
-- -meabi
-- -msdata=sysv
-- -mstrict-align
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=603e
+  - -meabi
+  - -msdata=sysv
+  - -mstrict-align
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optbruid.yml b/spec/build/bsps/powerpc/gen83xx/optbruid.yml
index e5732379ea..2dd57ebffe 100644
--- a/spec/build/bsps/powerpc/gen83xx/optbruid.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optbruid.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/br_uid
+default:
+- enabled-by: powerpc/br_uid
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, then use settings for the BR UID board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optchiptype.yml b/spec/build/bsps/powerpc/gen83xx/optchiptype.yml
index a46f38d4fd..657866d9e4 100644
--- a/spec/build/bsps/powerpc/gen83xx/optchiptype.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optchiptype.yml
@@ -5,20 +5,17 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 8313
-default-by-variant:
-- value: 8309
-  variants:
+default:
+- enabled-by:
   - powerpc/mpc8309som
-- value: 8309
-  variants:
   - powerpc/br_uid
-- value: 8349
-  variants:
+  value: 8309
+- enabled-by:
   - powerpc/mpc8349eamds
-- value: 8349
-  variants:
   - powerpc/hsc_cm01
+  value: 8349
+- enabled-by: true
+  value: 8313
 description: |
   chip type of the MPC83XX family
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/opthsccm01.yml b/spec/build/bsps/powerpc/gen83xx/opthsccm01.yml
index d934919885..701f4615eb 100644
--- a/spec/build/bsps/powerpc/gen83xx/opthsccm01.yml
+++ b/spec/build/bsps/powerpc/gen83xx/opthsccm01.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/hsc_cm01
+default:
+- enabled-by: powerpc/hsc_cm01
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, then use settings for the HSC_CM01 board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optirqnest.yml b/spec/build/bsps/powerpc/gen83xx/optirqnest.yml
index e24b81f9c6..2b423f600a 100644
--- a/spec/build/bsps/powerpc/gen83xx/optirqnest.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optirqnest.yml
@@ -5,14 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - powerpc/mpc8313erdb
-- value: false
-  variants:
   - powerpc/br_uid
+  value: false
+- enabled-by: true
+  value: true
 description: |
   enable interrupt nesting
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optmpc8309som.yml b/spec/build/bsps/powerpc/gen83xx/optmpc8309som.yml
index 6722fa2fb3..ecc57e38ce 100644
--- a/spec/build/bsps/powerpc/gen83xx/optmpc8309som.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optmpc8309som.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/mpc8309som
+default:
+- enabled-by: powerpc/mpc8309som
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, then use settings for the MPC8309SOM board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optmpc8313erdb.yml b/spec/build/bsps/powerpc/gen83xx/optmpc8313erdb.yml
index f8a9e0b47e..190b11b181 100644
--- a/spec/build/bsps/powerpc/gen83xx/optmpc8313erdb.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optmpc8313erdb.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/mpc8313erdb
+default:
+- enabled-by: powerpc/mpc8313erdb
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, then use settings for the MPC8313ERDB board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optmpc8349eamds.yml b/spec/build/bsps/powerpc/gen83xx/optmpc8349eamds.yml
index f6b766099d..0b6847d759 100644
--- a/spec/build/bsps/powerpc/gen83xx/optmpc8349eamds.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optmpc8349eamds.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/mpc8349eamds
+default:
+- enabled-by: powerpc/mpc8349eamds
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, then use settings for the MPC8349EAMDS board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optnandcs0.yml b/spec/build/bsps/powerpc/gen83xx/optnandcs0.yml
index d41820ea43..70cce58cba 100644
--- a/spec/build/bsps/powerpc/gen83xx/optnandcs0.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optnandcs0.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/br_uid
+default:
+- enabled-by: powerpc/br_uid
+  value: true
+- enabled-by: true
+  value: false
 description: |
   indicates if the board has a NAND large page flash on chip select 0
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optnet0phy.yml b/spec/build/bsps/powerpc/gen83xx/optnet0phy.yml
index 5571579a21..65045871d4 100644
--- a/spec/build/bsps/powerpc/gen83xx/optnet0phy.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optnet0phy.yml
@@ -5,14 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x00000011
-  variants:
-  - powerpc/mpc8309som
-- value: -0x0000001
-  variants:
-  - powerpc/br_uid
+default:
+- enabled-by: powerpc/mpc8309som
+  value: 0x00000011
+- enabled-by: powerpc/br_uid
+  value: -0x0000001
+- enabled-by: true
+  value: 0x00000000
 description: |
   PHY address of network interface 0
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optuart2.yml b/spec/build/bsps/powerpc/gen83xx/optuart2.yml
index c86b36f11b..95ef0fb361 100644
--- a/spec/build/bsps/powerpc/gen83xx/optuart2.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optuart2.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, enables UART2
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optuartirq.yml b/spec/build/bsps/powerpc/gen83xx/optuartirq.yml
index 5a845aa5fe..3fe9c17c5b 100644
--- a/spec/build/bsps/powerpc/gen83xx/optuartirq.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optuartirq.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/hsc_cm01
+default:
+- enabled-by: powerpc/hsc_cm01
+  value: false
+- enabled-by: true
+  value: true
 description: |
   enable usage of interrupts for the UART modules
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optuboot.yml b/spec/build/bsps/powerpc/gen83xx/optuboot.yml
index 6b1166553e..2a64e1757f 100644
--- a/spec/build/bsps/powerpc/gen83xx/optuboot.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optuboot.yml
@@ -5,17 +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/mpc8309som
-- value: true
-  variants:
   - powerpc/mpc8313erdb
-- value: true
-  variants:
   - powerpc/mpc8349eamds
+  value: true
+- enabled-by: true
+  value: false
 description: |
   if defined, enables U-Boot support
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/gen83xx/optulpi.yml b/spec/build/bsps/powerpc/gen83xx/optulpi.yml
index fd9be9f12f..a7e5f10e55 100644
--- a/spec/build/bsps/powerpc/gen83xx/optulpi.yml
+++ b/spec/build/bsps/powerpc/gen83xx/optulpi.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/br_uid
+default:
+- enabled-by: powerpc/br_uid
+  value: true
+- enabled-by: true
+  value: false
 description: |
   the board has an ULPI PHY connected to the USB EHCI controller
 enabled-by: true