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.

16 files changed, 43 insertions, 33 deletions

diff --git a/spec/build/bsps/arm/lpc176x/abi.yml b/spec/build/bsps/arm/lpc176x/abi.yml
index 77d5db8cf7..37f0e6056c 100644
--- a/spec/build/bsps/arm/lpc176x/abi.yml
+++ b/spec/build/bsps/arm/lpc176x/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mthumb
-- -mcpu=cortex-m3
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mthumb
+  - -mcpu=cortex-m3
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optcclk.yml b/spec/build/bsps/arm/lpc176x/optcclk.yml
index 5df9f0a5e2..d8c0288299 100644
--- a/spec/build/bsps/arm/lpc176x/optcclk.yml
+++ b/spec/build/bsps/arm/lpc176x/optcclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 96000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 96000000
 description: |
   CPU clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optconcfg.yml b/spec/build/bsps/arm/lpc176x/optconcfg.yml
index 98ff2a9325..5c9093e969 100644
--- a/spec/build/bsps/arm/lpc176x/optconcfg.yml
+++ b/spec/build/bsps/arm/lpc176x/optconcfg.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: |
   configuration for console (UART 0)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optdmachn.yml b/spec/build/bsps/arm/lpc176x/optdmachn.yml
index a7c288b3c7..817b0f7767 100644
--- a/spec/build/bsps/arm/lpc176x/optdmachn.yml
+++ b/spec/build/bsps/arm/lpc176x/optdmachn.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 2
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 2
 description: |
   DMA channel count
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optlpc1768.yml b/spec/build/bsps/arm/lpc176x/optlpc1768.yml
index 9d9673b002..a14d3c1434 100644
--- a/spec/build/bsps/arm/lpc176x/optlpc1768.yml
+++ b/spec/build/bsps/arm/lpc176x/optlpc1768.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: |
   target used for identify LPC1768 board
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optmintskstksz.yml b/spec/build/bsps/arm/lpc176x/optmintskstksz.yml
index 57e77ae551..5c4f2ce0b7 100644
--- a/spec/build/bsps/arm/lpc176x/optmintskstksz.yml
+++ b/spec/build/bsps/arm/lpc176x/optmintskstksz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1024
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 1024
 description: |
   Suggested minimum task stack size in bytes
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optoscmain.yml b/spec/build/bsps/arm/lpc176x/optoscmain.yml
index eccce9a3ea..8bbe329836 100644
--- a/spec/build/bsps/arm/lpc176x/optoscmain.yml
+++ b/spec/build/bsps/arm/lpc176x/optoscmain.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 12000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 12000000
 description: |
   main oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optoscrtc.yml b/spec/build/bsps/arm/lpc176x/optoscrtc.yml
index a5eff014e9..2c0895f3b9 100644
--- a/spec/build/bsps/arm/lpc176x/optoscrtc.yml
+++ b/spec/build/bsps/arm/lpc176x/optoscrtc.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 32768
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 32768
 description: |
   RTC oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optpclkdiv.yml b/spec/build/bsps/arm/lpc176x/optpclkdiv.yml
index 4027f8ad17..95c157ee3a 100644
--- a/spec/build/bsps/arm/lpc176x/optpclkdiv.yml
+++ b/spec/build/bsps/arm/lpc176x/optpclkdiv.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 1
 description: |
   clock divider for default PCLK (PCLK = CCLK / PCLKDIV)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optstopgpdma.yml b/spec/build/bsps/arm/lpc176x/optstopgpdma.yml
index d407af65e7..cd599b292e 100644
--- a/spec/build/bsps/arm/lpc176x/optstopgpdma.yml
+++ b/spec/build/bsps/arm/lpc176x/optstopgpdma.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: |
   stop general purpose DMA at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optstopusb.yml b/spec/build/bsps/arm/lpc176x/optstopusb.yml
index 708a5bb41c..7a0f8421ac 100644
--- a/spec/build/bsps/arm/lpc176x/optstopusb.yml
+++ b/spec/build/bsps/arm/lpc176x/optstopusb.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: |
   stop USB controller at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optuart1cfg.yml b/spec/build/bsps/arm/lpc176x/optuart1cfg.yml
index ec9d9843d5..53553c92b6 100644
--- a/spec/build/bsps/arm/lpc176x/optuart1cfg.yml
+++ b/spec/build/bsps/arm/lpc176x/optuart1cfg.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: |
   Use Uart 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/optuartbaud.yml b/spec/build/bsps/arm/lpc176x/optuartbaud.yml
index c5e094beef..2fa27c270f 100644
--- a/spec/build/bsps/arm/lpc176x/optuartbaud.yml
+++ b/spec/build/bsps/arm/lpc176x/optuartbaud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 9600
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 9600
 description: |
   baud for UARTs
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc176x/tstlpc1768mbed.yml b/spec/build/bsps/arm/lpc176x/tstlpc1768mbed.yml
index 0ce00994c3..43372d8106 100644
--- a/spec/build/bsps/arm/lpc176x/tstlpc1768mbed.yml
+++ b/spec/build/bsps/arm/lpc176x/tstlpc1768mbed.yml
@@ -25,8 +25,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbram.yml b/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbram.yml
index f1ba9bfba7..2aaf7a87dc 100644
--- a/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbram.yml
+++ b/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbram.yml
@@ -27,8 +27,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbrameth.yml b/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbrameth.yml
index 8a900bf5ab..bca644de68 100644
--- a/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbrameth.yml
+++ b/spec/build/bsps/arm/lpc176x/tstlpc1768mbedahbrameth.yml
@@ -126,8 +126,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: