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.

11 files changed, 48 insertions, 42 deletions

diff --git a/spec/build/bsps/powerpc/tqm8xx/abi.yml b/spec/build/bsps/powerpc/tqm8xx/abi.yml
index 42d984d9b2..cf5659825e 100644
--- a/spec/build/bsps/powerpc/tqm8xx/abi.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/abi.yml
@@ -7,13 +7,14 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -Dmpc860
-- -mcpu=860
-- -mstrict-align
-- -fno-strict-aliasing
-- -meabi
-- -msdata=sysv
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Dmpc860
+  - -mcpu=860
+  - -mstrict-align
+  - -fno-strict-aliasing
+  - -meabi
+  - -msdata=sysv
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconchn.yml b/spec/build/bsps/powerpc/tqm8xx/optconchn.yml
index a33cfc32ab..c186444a98 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconchn.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconchn.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_CHN_SMC1
-default-by-variant: []
+default:
+- enabled-by: true
+  value: CONS_CHN_SMC1
 description: |
   (BSP--console driver) Must be defined to be one of CONS_CHN_SMC1, CONS_CHN_SMC2, CONS_CHN_SCC1, CONS_CHN_SCC2, CONS_CHN_SCC3, or CONS_CHN_SCC4.  Determines which device will be registered as /dev/console.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml
index 6c0499daf1..cad2c32e70 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC1 UART IF mode) Must be defined if SCC1 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml
index 754abd522f..1d353b71a1 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC2 UART IF mode) Must be defined if SCC2 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml
index bdc665cbde..b3a80248d7 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC3 UART IF mode) Must be defined if SCC3 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml
index e26ffcad07..335eb23ec9 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC4 UART IF mode) Must be defined if SCC4 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml b/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml
index 7c7f563d00..2983d0805e 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml
@@ -5,14 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant:
-- value: CONS_MODE_POLLED
-  variants:
-  - powerpc/tqm8xx_stk8xx
-- value: CONS_MODE_IRQ
-  variants:
-  - powerpc/pghplus
+default:
+- enabled-by: powerpc/tqm8xx_stk8xx
+  value: CONS_MODE_POLLED
+- enabled-by: powerpc/pghplus
+  value: CONS_MODE_IRQ
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SMC1 UART IF mode) Must be defined if SMC1 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml b/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml
index c19c2850fb..495f70ecdd 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant:
-- value: CONS_MODE_POLLED
-  variants:
-  - powerpc/tqm8xx_stk8xx
+default:
+- enabled-by: powerpc/tqm8xx_stk8xx
+  value: CONS_MODE_POLLED
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SMC2 UART IF mode) Must be defined if SMC2 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml b/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml
index 52a1fc7afe..b8f8734d32 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optnetfec.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/pghplus
+default:
+- enabled-by: powerpc/pghplus
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, then the BSP will use the Fast Ethernet Controller for 10/100MBit networking and used as primary networking interface.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml b/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml
index fe3492accf..a62ca0456c 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optnetscc.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/pghplus
+default:
+- enabled-by: powerpc/pghplus
+  value: false
+- enabled-by: true
+  value: true
 description: |
   If defined, then the BSP will use the Serial Communications Controller (SCC1) for 10MBit networking.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml b/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml
index cffd48009d..d9b6f72adc 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_CHN_SMC1
-default-by-variant: []
+default:
+- enabled-by: true
+  value: CONS_CHN_SMC1
 description: |
   (BSP--console driver) Must be defined to be one of CONS_CHN_SMC1, CONS_CHN_SMC2, CONS_CHN_SCC2, CONS_CHN_SCC3, or CONS_CHN_SCC4. Determines which device is used for output by printk(). If the port that printk() uses is also used for other I/O (e.g. if  PRINTK_CHN == CONSOLE_CHN), then both ports should use the same type of I/O, otherwise the drivers will likely conflict with each other.
 enabled-by: true