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, 49 insertions, 35 deletions

diff --git a/spec/build/bsps/arm/atsam/abi.yml b/spec/build/bsps/arm/atsam/abi.yml
index 7a95742c36..afb6d04b14 100644
--- a/spec/build/bsps/arm/atsam/abi.yml
+++ b/spec/build/bsps/arm/atsam/abi.yml
@@ -7,11 +7,12 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mthumb
-- -mcpu=cortex-m7
-- -mfpu=fpv5-d16
-- -mfloat-abi=hard
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mthumb
+  - -mcpu=cortex-m7
+  - -mfpu=fpv5-d16
+  - -mfloat-abi=hard
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optchgclksram.yml b/spec/build/bsps/arm/atsam/optchgclksram.yml
index 58dca377d7..6d1c6e947e 100644
--- a/spec/build/bsps/arm/atsam/optchgclksram.yml
+++ b/spec/build/bsps/arm/atsam/optchgclksram.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: |
   Move the functions that set up the clock into the SRAM.  This allows to change the clock frequency even if the application is started from SDRAM.  Requires a TCM_SIZE > 0.
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optchip.yml b/spec/build/bsps/arm/atsam/optchip.yml
index 16998e6c2a..0568b6c41d 100644
--- a/spec/build/bsps/arm/atsam/optchip.yml
+++ b/spec/build/bsps/arm/atsam/optchip.yml
@@ -43,8 +43,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: samv71q21
-default-by-variant: []
+default:
+- enabled-by: true
+  value: samv71q21
 description: |
   Chip variant
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optconbaud.yml b/spec/build/bsps/arm/atsam/optconbaud.yml
index b0e34e7505..f80c5aa846 100644
--- a/spec/build/bsps/arm/atsam/optconbaud.yml
+++ b/spec/build/bsps/arm/atsam/optconbaud.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: |
   initial baud for console devices (default 115200)
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optconidx.yml b/spec/build/bsps/arm/atsam/optconidx.yml
index d58d75e4aa..3318cd7e2a 100644
--- a/spec/build/bsps/arm/atsam/optconidx.yml
+++ b/spec/build/bsps/arm/atsam/optconidx.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: |
   device index for /dev/console (default 1, e.g. USART1)
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optconirq.yml b/spec/build/bsps/arm/atsam/optconirq.yml
index a410e05060..710649f8af 100644
--- a/spec/build/bsps/arm/atsam/optconirq.yml
+++ b/spec/build/bsps/arm/atsam/optconirq.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 interrupt driven mode for console devices (used by default)
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optcontype.yml b/spec/build/bsps/arm/atsam/optcontype.yml
index 6846fed5f2..4f5f313df8 100644
--- a/spec/build/bsps/arm/atsam/optcontype.yml
+++ b/spec/build/bsps/arm/atsam/optcontype.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: |
   device type for /dev/console, use 0 for USART and 1 for UART (default USART)
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optmck.yml b/spec/build/bsps/arm/atsam/optmck.yml
index d216542285..2b40fbdfb5 100644
--- a/spec/build/bsps/arm/atsam/optmck.yml
+++ b/spec/build/bsps/arm/atsam/optmck.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 123000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 123000000
 description: |
   Frequency of the MCK in Hz. Set to 0 to force application defined speed.  See start/pmc-config.c for available clock configurations.
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optnocachesz.yml b/spec/build/bsps/arm/atsam/optnocachesz.yml
index d7d4783260..1bf7d0b093 100644
--- a/spec/build/bsps/arm/atsam/optnocachesz.yml
+++ b/spec/build/bsps/arm/atsam/optnocachesz.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00001000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00001000
 description: |
   size of NOCACHE section in bytes
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optnullsz.yml b/spec/build/bsps/arm/atsam/optnullsz.yml
index 6e316b44b4..b2fc304924 100644
--- a/spec/build/bsps/arm/atsam/optnullsz.yml
+++ b/spec/build/bsps/arm/atsam/optnullsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of the NULL pointer protection area in bytes.  This memory area reduces
   the size of the ITCM available to the application.
diff --git a/spec/build/bsps/arm/atsam/optoscmain.yml b/spec/build/bsps/arm/atsam/optoscmain.yml
index 4cafffea37..dd411a651f 100644
--- a/spec/build/bsps/arm/atsam/optoscmain.yml
+++ b/spec/build/bsps/arm/atsam/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 (default 12MHz)
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optqspiflashsz.yml b/spec/build/bsps/arm/atsam/optqspiflashsz.yml
index 49f15891b0..9174d0d893 100644
--- a/spec/build/bsps/arm/atsam/optqspiflashsz.yml
+++ b/spec/build/bsps/arm/atsam/optqspiflashsz.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00200000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00200000
 description: |
   size of QSPI flash in bytes
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/optsdram.yml b/spec/build/bsps/arm/atsam/optsdram.yml
index 0c3808ab2b..d597e0106c 100644
--- a/spec/build/bsps/arm/atsam/optsdram.yml
+++ b/spec/build/bsps/arm/atsam/optsdram.yml
@@ -26,8 +26,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: is42s16100e-7bli
-default-by-variant: []
+default:
+- enabled-by: true
+  value: is42s16100e-7bli
 description: |
   SDRAM variant. Known chips are "is42s16100e-7bli", "is42s16320f-7bl",
   "mt48lc16m16a2p-6a". You can also set this to "custom-<RAM_SIZE>" (for example
diff --git a/spec/build/bsps/arm/atsam/opttcmsz.yml b/spec/build/bsps/arm/atsam/opttcmsz.yml
index 1cb51fcc78..1ed0da4778 100644
--- a/spec/build/bsps/arm/atsam/opttcmsz.yml
+++ b/spec/build/bsps/arm/atsam/opttcmsz.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of tightly coupled memories (TCM) in bytes.  Note that the ITCM is
   reduced by the ATSAM_MEMORY_NULL_SIZE option.  DTCM is unaffected.
diff --git a/spec/build/bsps/arm/atsam/optusextal.yml b/spec/build/bsps/arm/atsam/optusextal.yml
index 6353956d15..3869b18743 100644
--- a/spec/build/bsps/arm/atsam/optusextal.yml
+++ b/spec/build/bsps/arm/atsam/optusextal.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 the external crystal as source for the slow clock instead of the internal RC oscillator. Note that on the ATSAM the NRST pin seems to depend on the slow clock as well as all watchdogs. If ATSAM_SLOWCLOCK_USE_XTAL is set to 1 without a external crystal connected, the controller might hang in the switching process without a working NRST pin.
 enabled-by: true
diff --git a/spec/build/bsps/arm/atsam/tstatsamv.yml b/spec/build/bsps/arm/atsam/tstatsamv.yml
index 8af2234f22..f90cc615d3 100644
--- a/spec/build/bsps/arm/atsam/tstatsamv.yml
+++ b/spec/build/bsps/arm/atsam/tstatsamv.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: []