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.

29 files changed, 92 insertions, 65 deletions

diff --git a/spec/build/bsps/arm/lpc32xx/abi.yml b/spec/build/bsps/arm/lpc32xx/abi.yml
index ae245b4eb0..3fa82f50fe 100644
--- a/spec/build/bsps/arm/lpc32xx/abi.yml
+++ b/spec/build/bsps/arm/lpc32xx/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=arm926ej-s
-- -mthumb
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=arm926ej-s
+  - -mthumb
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optdismmu.yml b/spec/build/bsps/arm/lpc32xx/optdismmu.yml
index b431f04841..f0acf5a4b3 100644
--- a/spec/build/bsps/arm/lpc32xx/optdismmu.yml
+++ b/spec/build/bsps/arm/lpc32xx/optdismmu.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: |
   disable MMU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optdisroprot.yml b/spec/build/bsps/arm/lpc32xx/optdisroprot.yml
index 5ce23607b8..4a2b675db7 100644
--- a/spec/build/bsps/arm/lpc32xx/optdisroprot.yml
+++ b/spec/build/bsps/arm/lpc32xx/optdisroprot.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: |
   disable MMU protection of read-only sections
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optdisrwdc.yml b/spec/build/bsps/arm/lpc32xx/optdisrwdc.yml
index 55765c3e8e..f378ad048a 100644
--- a/spec/build/bsps/arm/lpc32xx/optdisrwdc.yml
+++ b/spec/build/bsps/arm/lpc32xx/optdisrwdc.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: |
   disable cache for read-write data sections
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optdmachn.yml b/spec/build/bsps/arm/lpc32xx/optdmachn.yml
index 4c826a5f01..19f8acb182 100644
--- a/spec/build/bsps/arm/lpc32xx/optdmachn.yml
+++ b/spec/build/bsps/arm/lpc32xx/optdmachn.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 8
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 8
 description: |
   DMA channel count
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optenwdgrst.yml b/spec/build/bsps/arm/lpc32xx/optenwdgrst.yml
index d36a5c0398..c06a6b2fca 100644
--- a/spec/build/bsps/arm/lpc32xx/optenwdgrst.yml
+++ b/spec/build/bsps/arm/lpc32xx/optenwdgrst.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: |
   bsp_reset() will use the watchdog to reset the chip
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optethrmii.yml b/spec/build/bsps/arm/lpc32xx/optethrmii.yml
index ccb4c95abc..ed51b9491e 100644
--- a/spec/build/bsps/arm/lpc32xx/optethrmii.yml
+++ b/spec/build/bsps/arm/lpc32xx/optethrmii.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 RMII for Ethernet
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optoscmain.yml b/spec/build/bsps/arm/lpc32xx/optoscmain.yml
index aadb9b6799..6f93400e98 100644
--- a/spec/build/bsps/arm/lpc32xx/optoscmain.yml
+++ b/spec/build/bsps/arm/lpc32xx/optoscmain.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 13000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 13000000
 description: |
   main oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optoscrtc.yml b/spec/build/bsps/arm/lpc32xx/optoscrtc.yml
index 09aab2d9c6..443f19e963 100644
--- a/spec/build/bsps/arm/lpc32xx/optoscrtc.yml
+++ b/spec/build/bsps/arm/lpc32xx/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/lpc32xx/optotgi2c.yml b/spec/build/bsps/arm/lpc32xx/optotgi2c.yml
index 2f7d54425c..a2705d5219 100644
--- a/spec/build/bsps/arm/lpc32xx/optotgi2c.yml
+++ b/spec/build/bsps/arm/lpc32xx/optotgi2c.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x00000058
-  variants:
+default:
+- enabled-by:
   - arm/lpc32xx_mzx
   - arm/lpc32xx_mzx_stage_1
   - arm/lpc32xx_mzx_stage_2
+  value: 0x00000058
+- enabled-by: true
+  value: 0x00000000
 description: |
   USB OTG transceiver I2C address used by USB stack
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optotgvbus.yml b/spec/build/bsps/arm/lpc32xx/optotgvbus.yml
index e5d2563a7b..038e04472e 100644
--- a/spec/build/bsps/arm/lpc32xx/optotgvbus.yml
+++ b/spec/build/bsps/arm/lpc32xx/optotgvbus.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: USB_OTG_VBUS_POWER_WITH_CHARGE_PUMP
-  variants:
+default:
+- enabled-by:
   - arm/lpc32xx_mzx
   - arm/lpc32xx_mzx_stage_1
   - arm/lpc32xx_mzx_stage_2
+  value: USB_OTG_VBUS_POWER_WITH_CHARGE_PUMP
+- enabled-by: true
+  value: false
 description: |
   USB OTG transceiver VBUS policy
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optperiphclk.yml b/spec/build/bsps/arm/lpc32xx/optperiphclk.yml
index 70be8d51bf..dfd3e27953 100644
--- a/spec/build/bsps/arm/lpc32xx/optperiphclk.yml
+++ b/spec/build/bsps/arm/lpc32xx/optperiphclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 13000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 13000000
 description: |
   peripheral clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optresetvec.yml b/spec/build/bsps/arm/lpc32xx/optresetvec.yml
index efd1ea2b2a..bac5c79627 100644
--- a/spec/build/bsps/arm/lpc32xx/optresetvec.yml
+++ b/spec/build/bsps/arm/lpc32xx/optresetvec.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: |
   reset vector address for BSP start
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optscratchsz.yml b/spec/build/bsps/arm/lpc32xx/optscratchsz.yml
index ad8473d57d..5299cfa992 100644
--- a/spec/build/bsps/arm/lpc32xx/optscratchsz.yml
+++ b/spec/build/bsps/arm/lpc32xx/optscratchsz.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 4096
-  variants:
+default:
+- enabled-by:
   - arm/lpc32xx_mzx
   - arm/lpc32xx_mzx_stage_1
   - arm/lpc32xx_mzx_stage_2
+  value: 4096
+- enabled-by: true
+  value: 0
 description: |
   size of scratch area
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optstopeth.yml b/spec/build/bsps/arm/lpc32xx/optstopeth.yml
index 2d430a1862..036b3c14a3 100644
--- a/spec/build/bsps/arm/lpc32xx/optstopeth.yml
+++ b/spec/build/bsps/arm/lpc32xx/optstopeth.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 Ethernet controller at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optstopgpdma.yml b/spec/build/bsps/arm/lpc32xx/optstopgpdma.yml
index 5096cc48a9..d5894ce274 100644
--- a/spec/build/bsps/arm/lpc32xx/optstopgpdma.yml
+++ b/spec/build/bsps/arm/lpc32xx/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/lpc32xx/optstopusb.yml b/spec/build/bsps/arm/lpc32xx/optstopusb.yml
index e2bbc72f5f..8b6991a01d 100644
--- a/spec/build/bsps/arm/lpc32xx/optstopusb.yml
+++ b/spec/build/bsps/arm/lpc32xx/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/lpc32xx/optu3clk.yml b/spec/build/bsps/arm/lpc32xx/optu3clk.yml
index ee0f7f3157..998841d033 100644
--- a/spec/build/bsps/arm/lpc32xx/optu3clk.yml
+++ b/spec/build/bsps/arm/lpc32xx/optu3clk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00001386
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00001386
 description: |
   clock configuration for UART 3
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optu4clk.yml b/spec/build/bsps/arm/lpc32xx/optu4clk.yml
index 4d4f014f7f..d0dafb8f78 100644
--- a/spec/build/bsps/arm/lpc32xx/optu4clk.yml
+++ b/spec/build/bsps/arm/lpc32xx/optu4clk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00001386
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00001386
 description: |
   clock configuration for UART 4
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optu5clk.yml b/spec/build/bsps/arm/lpc32xx/optu5clk.yml
index 5226085029..47065d8eeb 100644
--- a/spec/build/bsps/arm/lpc32xx/optu5clk.yml
+++ b/spec/build/bsps/arm/lpc32xx/optu5clk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00001386
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00001386
 description: |
   clock configuration for UART 5
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optu6clk.yml b/spec/build/bsps/arm/lpc32xx/optu6clk.yml
index 03437e6fe0..9a6a89da97 100644
--- a/spec/build/bsps/arm/lpc32xx/optu6clk.yml
+++ b/spec/build/bsps/arm/lpc32xx/optu6clk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00001386
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00001386
 description: |
   clock configuration for UART 6
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart1baud.yml b/spec/build/bsps/arm/lpc32xx/optuart1baud.yml
index d0b7a546db..b1267567f1 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart1baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart1baud.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: |
   baud for UART 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart2baud.yml b/spec/build/bsps/arm/lpc32xx/optuart2baud.yml
index 5bdf8be11b..cd848156e8 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart2baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart2baud.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: |
   baud for UART 2
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart3baud.yml b/spec/build/bsps/arm/lpc32xx/optuart3baud.yml
index 95e63cf56e..48513c9370 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart3baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart3baud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 115200
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 115200
 description: |
   baud for UART 3
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart4baud.yml b/spec/build/bsps/arm/lpc32xx/optuart4baud.yml
index d210bd3c6b..66ac9b857a 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart4baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart4baud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 115200
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 115200
 description: |
   baud for UART 4
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart5baud.yml b/spec/build/bsps/arm/lpc32xx/optuart5baud.yml
index 0021d5c9ed..c09f50b481 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart5baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart5baud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 115200
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 115200
 description: |
   baud for UART 5
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart6baud.yml b/spec/build/bsps/arm/lpc32xx/optuart6baud.yml
index dc856fa33e..2d512f00a1 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart6baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart6baud.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 115200
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 115200
 description: |
   baud for UART 6
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optuart7baud.yml b/spec/build/bsps/arm/lpc32xx/optuart7baud.yml
index 867d534e57..90b72e4570 100644
--- a/spec/build/bsps/arm/lpc32xx/optuart7baud.yml
+++ b/spec/build/bsps/arm/lpc32xx/optuart7baud.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: |
   baud for UART 7
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/tstmzxstage1.yml b/spec/build/bsps/arm/lpc32xx/tstmzxstage1.yml
index 0dbde105cb..2821aeb5c3 100644
--- a/spec/build/bsps/arm/lpc32xx/tstmzxstage1.yml
+++ b/spec/build/bsps/arm/lpc32xx/tstmzxstage1.yml
@@ -16,8 +16,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: