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.

7 files changed, 24 insertions, 17 deletions

diff --git a/spec/build/bsps/arm/xen/abi.yml b/spec/build/bsps/arm/xen/abi.yml
index ed581d94f4..dbd1dfa9a6 100644
--- a/spec/build/bsps/arm/xen/abi.yml
+++ b/spec/build/bsps/arm/xen/abi.yml
@@ -7,11 +7,12 @@ 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
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -march=armv7-a
+  - -mthumb
+  - -mfpu=neon
+  - -mfloat-abi=hard
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/xen/optgentmunmask.yml b/spec/build/bsps/arm/xen/optgentmunmask.yml
index 1e7c523f15..ade26bd0b3 100644
--- a/spec/build/bsps/arm/xen/optgentmunmask.yml
+++ b/spec/build/bsps/arm/xen/optgentmunmask.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: |
   unmask the timer in the tick handler, since Xen will mask the virtual timer before injecting the interrupt to the guest
 enabled-by: true
diff --git a/spec/build/bsps/arm/xen/optloadoff.yml b/spec/build/bsps/arm/xen/optloadoff.yml
index 2796f9b52d..6705a1d867 100644
--- a/spec/build/bsps/arm/xen/optloadoff.yml
+++ b/spec/build/bsps/arm/xen/optloadoff.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00008000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00008000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/arm/xen/optnocachelen.yml b/spec/build/bsps/arm/xen/optnocachelen.yml
index b3661bd491..04bd28816e 100644
--- a/spec/build/bsps/arm/xen/optnocachelen.yml
+++ b/spec/build/bsps/arm/xen/optnocachelen.yml
@@ -7,8 +7,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: |
   length of nocache RAM region
 enabled-by: true
diff --git a/spec/build/bsps/arm/xen/optramlen.yml b/spec/build/bsps/arm/xen/optramlen.yml
index 8ba7d0b4a3..ac7cb7d486 100644
--- a/spec/build/bsps/arm/xen/optramlen.yml
+++ b/spec/build/bsps/arm/xen/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00800000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00800000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/arm/xen/optramori.yml b/spec/build/bsps/arm/xen/optramori.yml
index 32b4acd160..d0f72c0c12 100644
--- a/spec/build/bsps/arm/xen/optramori.yml
+++ b/spec/build/bsps/arm/xen/optramori.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x40000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x40000000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/arm/xen/optzimghdr.yml b/spec/build/bsps/arm/xen/optzimghdr.yml
index 56aa00c8b1..56eb40bde0 100644
--- a/spec/build/bsps/arm/xen/optzimghdr.yml
+++ b/spec/build/bsps/arm/xen/optzimghdr.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: |
   include zImage boot header
 enabled-by: true