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, 29 insertions, 24 deletions

diff --git a/spec/build/bsps/arm/raspberrypi/abi.yml b/spec/build/bsps/arm/raspberrypi/abi.yml
index 66459a1e1b..9cbe152c32 100644
--- a/spec/build/bsps/arm/raspberrypi/abi.yml
+++ b/spec/build/bsps/arm/raspberrypi/abi.yml
@@ -7,16 +7,16 @@ 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:
-- value:
+- enabled-by: arm/raspberrypi
+  value:
   - -mcpu=arm1176jzf-s
-  variants:
-  - arm/raspberrypi
+- 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/raspberrypi/opti2ciomode.yml b/spec/build/bsps/arm/raspberrypi/opti2ciomode.yml
index 82ba37dc4d..86e77d2cc6 100644
--- a/spec/build/bsps/arm/raspberrypi/opti2ciomode.yml
+++ b/spec/build/bsps/arm/raspberrypi/opti2ciomode.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: |
   Define to 1 to use interrupt-driven I/O with the Raspberry Pi I2C bus. If defined to other value the access will be polled-driven.
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optnocachelen.yml b/spec/build/bsps/arm/raspberrypi/optnocachelen.yml
index 436ada3955..aff5d4ebe7 100644
--- a/spec/build/bsps/arm/raspberrypi/optnocachelen.yml
+++ b/spec/build/bsps/arm/raspberrypi/optnocachelen.yml
@@ -7,8 +7,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: |
   No-cache region length
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optramlen.yml b/spec/build/bsps/arm/raspberrypi/optramlen.yml
index df409a3341..21baba60cf 100644
--- a/spec/build/bsps/arm/raspberrypi/optramlen.yml
+++ b/spec/build/bsps/arm/raspberrypi/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x10000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x10000000
 description: |
   RAM region length
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optresetvec.yml b/spec/build/bsps/arm/raspberrypi/optresetvec.yml
index efd1ea2b2a..bac5c79627 100644
--- a/spec/build/bsps/arm/raspberrypi/optresetvec.yml
+++ b/spec/build/bsps/arm/raspberrypi/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/raspberrypi/optrpi2.yml b/spec/build/bsps/arm/raspberrypi/optrpi2.yml
index 08e3a1e381..39e9b7b779 100644
--- a/spec/build/bsps/arm/raspberrypi/optrpi2.yml
+++ b/spec/build/bsps/arm/raspberrypi/optrpi2.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - arm/raspberrypi2
+default:
+- enabled-by: arm/raspberrypi2
+  value: true
+- enabled-by: true
+  value: false
 description: |
   Set if the BSP variant is Raspberry Pi 2.
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optspiiomode.yml b/spec/build/bsps/arm/raspberrypi/optspiiomode.yml
index bb0b94a683..69c197be59 100644
--- a/spec/build/bsps/arm/raspberrypi/optspiiomode.yml
+++ b/spec/build/bsps/arm/raspberrypi/optspiiomode.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: |
   Define to 1 to use interrupt-driven I/O with the Raspberry Pi SPI bus. If defined to other value the access will be polled-driven.
 enabled-by: true