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.

15 files changed, 48 insertions, 33 deletions

diff --git a/spec/build/bsps/arm/imxrt/abi.yml b/spec/build/bsps/arm/imxrt/abi.yml
index 7a95742c36..afb6d04b14 100644
--- a/spec/build/bsps/arm/imxrt/abi.yml
+++ b/spec/build/bsps/arm/imxrt/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/imxrt/optfsledmaemlm.yml b/spec/build/bsps/arm/imxrt/optfsledmaemlm.yml
index 80c840373d..19d3ec60fc 100644
--- a/spec/build/bsps/arm/imxrt/optfsledmaemlm.yml
+++ b/spec/build/bsps/arm/imxrt/optfsledmaemlm.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 the minor loop mapping of the Freescale EDMA.
 enabled-by: true
diff --git a/spec/build/bsps/arm/imxrt/optlinkcmds.yml b/spec/build/bsps/arm/imxrt/optlinkcmds.yml
index cb398b4a89..8499f6bfee 100644
--- a/spec/build/bsps/arm/imxrt/optlinkcmds.yml
+++ b/spec/build/bsps/arm/imxrt/optlinkcmds.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: linkcmds.flexspi
-default-by-variant: []
+default:
+- enabled-by: true
+  value: linkcmds.flexspi
 description: |
   The default linker command file.  Must be linkcmds.sdram, linkcmds.ocram or
   linkcmds.flexspi.
diff --git a/spec/build/bsps/arm/imxrt/optmemdtcmsz.yml b/spec/build/bsps/arm/imxrt/optmemdtcmsz.yml
index 646460c48b..ac87854181 100644
--- a/spec/build/bsps/arm/imxrt/optmemdtcmsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemdtcmsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00020000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00020000
 description: |
   Size of the DTCM in bytes. Note that these sizes depend on fuses or software
   settings done by a bootloader (together with ITCM and OCRAM).
diff --git a/spec/build/bsps/arm/imxrt/optmemextramnocachesz.yml b/spec/build/bsps/arm/imxrt/optmemextramnocachesz.yml
index e4e2616a1e..fa386d42c7 100644
--- a/spec/build/bsps/arm/imxrt/optmemextramnocachesz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemextramnocachesz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00100000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   Size of the nocache area at the end of the external RAM in bytes.  Must not be
   bigger than IMXRT_MEMORY_EXTRAM_SIZE.
diff --git a/spec/build/bsps/arm/imxrt/optmemextramorigin.yml b/spec/build/bsps/arm/imxrt/optmemextramorigin.yml
index c0becc935a..b9660aca5e 100644
--- a/spec/build/bsps/arm/imxrt/optmemextramorigin.yml
+++ b/spec/build/bsps/arm/imxrt/optmemextramorigin.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x80000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x80000000
 description: |
   Base address of the external RAM.  An external ram can be for example be a
   SDRAM connected to SEMC or a HyperRAM connected to FlexSPI.
diff --git a/spec/build/bsps/arm/imxrt/optmemextramsz.yml b/spec/build/bsps/arm/imxrt/optmemextramsz.yml
index b547ec44fe..3e5cdac34c 100644
--- a/spec/build/bsps/arm/imxrt/optmemextramsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemextramsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x02000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x02000000
 description: |
   Size of the external RAM in bytes.  An external ram can be for example be a
   SDRAM connected to SEMC or a HyperRAM connected to FlexSPI.  The size has to
diff --git a/spec/build/bsps/arm/imxrt/optmemflashcfgsz.yml b/spec/build/bsps/arm/imxrt/optmemflashcfgsz.yml
index 4c1e4b3276..e53649ea3d 100644
--- a/spec/build/bsps/arm/imxrt/optmemflashcfgsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemflashcfgsz.yml
@@ -5,8 +5,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 the flash configuration area at the start of the FlexSPI / SEMC flash
   in bytes. Either 4 KByte for FlexSPI NOR / SEMC NOR or 1 Kbyte for most other.
diff --git a/spec/build/bsps/arm/imxrt/optmemflashivtsz.yml b/spec/build/bsps/arm/imxrt/optmemflashivtsz.yml
index 0af2fc2981..96f3e95875 100644
--- a/spec/build/bsps/arm/imxrt/optmemflashivtsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemflashivtsz.yml
@@ -5,8 +5,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 the image vector table, boot data structure, device configuration data
   and similar program image header information. Take a look at the i.MX RT1050
diff --git a/spec/build/bsps/arm/imxrt/optmemflashorigin.yml b/spec/build/bsps/arm/imxrt/optmemflashorigin.yml
index 4805d319cf..54618c928f 100644
--- a/spec/build/bsps/arm/imxrt/optmemflashorigin.yml
+++ b/spec/build/bsps/arm/imxrt/optmemflashorigin.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x60000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x60000000
 description: |
   Origin of the external flash memory.  That can be for example a flash
   connected to FlexSPI or to SEMC.  The default value is for a HyperFlash
diff --git a/spec/build/bsps/arm/imxrt/optmemflashsz.yml b/spec/build/bsps/arm/imxrt/optmemflashsz.yml
index 6683977ef2..562293eda0 100644
--- a/spec/build/bsps/arm/imxrt/optmemflashsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemflashsz.yml
@@ -6,8 +6,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x04000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x04000000
 description: |
   Size of the external flash area in bytes.  Has to be big enough to hold the
   i.MXRT initial vector table (IVT) and configuration information.  The sizes of
diff --git a/spec/build/bsps/arm/imxrt/optmemitcmsz.yml b/spec/build/bsps/arm/imxrt/optmemitcmsz.yml
index 83d3c75f4b..611fbf72f3 100644
--- a/spec/build/bsps/arm/imxrt/optmemitcmsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemitcmsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x0001ff00
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x0001ff00
 description: |
   Size of the ITCM in bytes.  Note that these sizes depend on fuses or software
   settings done by a bootloader (together with DTCM and OCRAM).  The ITCM size
diff --git a/spec/build/bsps/arm/imxrt/optmemnullsz.yml b/spec/build/bsps/arm/imxrt/optmemnullsz.yml
index 029a996203..061d94a34b 100644
--- a/spec/build/bsps/arm/imxrt/optmemnullsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemnullsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000100
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000100
 description: |
   Size of the NULL pointer protection area in bytes.  This memory area reduces
   the size of the ITCM available to the application.  If you adapt this, you
diff --git a/spec/build/bsps/arm/imxrt/optmemocramnocachesz.yml b/spec/build/bsps/arm/imxrt/optmemocramnocachesz.yml
index 6b738a2a08..d87e412c52 100644
--- a/spec/build/bsps/arm/imxrt/optmemocramnocachesz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemocramnocachesz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: |
   Size of the nocache area at the end of the OCRAM in bytes.  Must not be bigger
   than IMXRT_MEMORY_OCRAM_SIZE.
diff --git a/spec/build/bsps/arm/imxrt/optmemocramsz.yml b/spec/build/bsps/arm/imxrt/optmemocramsz.yml
index b37b84eb77..0ab26700db 100644
--- a/spec/build/bsps/arm/imxrt/optmemocramsz.yml
+++ b/spec/build/bsps/arm/imxrt/optmemocramsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00040000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00040000
 description: |
   Size of the OCRAM in bytes.  Note that these sizes depend on fuses or software
   settings done by a bootloader (together with ITCM and DTCM).  The size has to