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.

10 files changed, 38 insertions, 28 deletions

diff --git a/spec/build/bsps/arm/imx/abi.yml b/spec/build/bsps/arm/imx/abi.yml
index 169a5e6584..c666949cd0 100644
--- a/spec/build/bsps/arm/imx/abi.yml
+++ b/spec/build/bsps/arm/imx/abi.yml
@@ -7,12 +7,13 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -march=armv7-a
-- -mthumb
-- -mfpu=neon
-- -mfloat-abi=hard
-- -mtune=cortex-a7
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -march=armv7-a
+  - -mthumb
+  - -mfpu=neon
+  - -mfloat-abi=hard
+  - -mtune=cortex-a7
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcachedata.yml b/spec/build/bsps/arm/imx/optcachedata.yml
index 23b1410385..c86800df35 100644
--- a/spec/build/bsps/arm/imx/optcachedata.yml
+++ b/spec/build/bsps/arm/imx/optcachedata.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu
+  value: false
+- enabled-by: true
+  value: true
 description: |
   enable data cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcacheinst.yml b/spec/build/bsps/arm/imx/optcacheinst.yml
index f172cc4b58..90e0e1301a 100644
--- a/spec/build/bsps/arm/imx/optcacheinst.yml
+++ b/spec/build/bsps/arm/imx/optcacheinst.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
+default:
+- enabled-by:
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu
+  value: false
+- enabled-by: true
+  value: true
 description: |
   enable instruction cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optccmahb.yml b/spec/build/bsps/arm/imx/optccmahb.yml
index a515a44204..9137c269c0 100644
--- a/spec/build/bsps/arm/imx/optccmahb.yml
+++ b/spec/build/bsps/arm/imx/optccmahb.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 135000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 135000000
 description: |
   AHB clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmecspi.yml b/spec/build/bsps/arm/imx/optcmmecspi.yml
index 1f32305aef..1802608b3a 100644
--- a/spec/build/bsps/arm/imx/optcmmecspi.yml
+++ b/spec/build/bsps/arm/imx/optcmmecspi.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 67500000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 67500000
 description: |
   ECSPI clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmipg.yml b/spec/build/bsps/arm/imx/optcmmipg.yml
index 8c62921ef6..98fd8abf0e 100644
--- a/spec/build/bsps/arm/imx/optcmmipg.yml
+++ b/spec/build/bsps/arm/imx/optcmmipg.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 67500000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 67500000
 description: |
   IPG clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmsdhci.yml b/spec/build/bsps/arm/imx/optcmmsdhci.yml
index fa06f8111a..120b0997ed 100644
--- a/spec/build/bsps/arm/imx/optcmmsdhci.yml
+++ b/spec/build/bsps/arm/imx/optcmmsdhci.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 196363000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 196363000
 description: |
   SDHCI clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmuart.yml b/spec/build/bsps/arm/imx/optcmmuart.yml
index ab69c87323..467d4dc091 100644
--- a/spec/build/bsps/arm/imx/optcmmuart.yml
+++ b/spec/build/bsps/arm/imx/optcmmuart.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 24000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 24000000
 description: |
   UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optconirq.yml b/spec/build/bsps/arm/imx/optconirq.yml
index d94a5d20d9..ac5183c17c 100644
--- a/spec/build/bsps/arm/imx/optconirq.yml
+++ b/spec/build/bsps/arm/imx/optconirq.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: |
   use interrupt driven mode for console devices (used by default)
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optresetvec.yml b/spec/build/bsps/arm/imx/optresetvec.yml
index efd1ea2b2a..bac5c79627 100644
--- a/spec/build/bsps/arm/imx/optresetvec.yml
+++ b/spec/build/bsps/arm/imx/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