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, 19 insertions, 14 deletions

diff --git a/spec/build/bsps/m68k/mvme167/abi.yml b/spec/build/bsps/m68k/mvme167/abi.yml
index 3bedb8a896..3caa563de3 100644
--- a/spec/build/bsps/m68k/mvme167/abi.yml
+++ b/spec/build/bsps/m68k/mvme167/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=68040
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=68040
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optconminor.yml b/spec/build/bsps/m68k/mvme167/optconminor.yml
index f6694db348..350301d8b2 100644
--- a/spec/build/bsps/m68k/mvme167/optconminor.yml
+++ b/spec/build/bsps/m68k/mvme167/optconminor.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: |
   Port to use for the RTEMS console.  0 - /dev/tty0, Serial Port 1/Console on the MVME712M.  1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.  2 - /dev/tty2, Serial Port 3 on the MVME712M.  3 - /dev/tty3, Serial Port 4 on the MVME712M.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optintlvl.yml b/spec/build/bsps/m68k/mvme167/optintlvl.yml
index 6b5005c11d..04c2b0aeb1 100644
--- a/spec/build/bsps/m68k/mvme167/optintlvl.yml
+++ b/spec/build/bsps/m68k/mvme167/optintlvl.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: |
   Interrupt level for the CD2401(when CD2401_IO_MODE == 1).
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optiomode.yml b/spec/build/bsps/m68k/mvme167/optiomode.yml
index 44b38da713..cb42a8f693 100644
--- a/spec/build/bsps/m68k/mvme167/optiomode.yml
+++ b/spec/build/bsps/m68k/mvme167/optiomode.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: |
   0 for polled I/O, 1 for interrupt-driven.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optmvme167.yml b/spec/build/bsps/m68k/mvme167/optmvme167.yml
index b857d705bd..6863696c47 100644
--- a/spec/build/bsps/m68k/mvme167/optmvme167.yml
+++ b/spec/build/bsps/m68k/mvme167/optmvme167.yml
@@ -5,8 +5,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: |
   Defines mvme167 in <bspopts.h>.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optprintkminor.yml b/spec/build/bsps/m68k/mvme167/optprintkminor.yml
index 5976e1dbbb..cad5de52c7 100644
--- a/spec/build/bsps/m68k/mvme167/optprintkminor.yml
+++ b/spec/build/bsps/m68k/mvme167/optprintkminor.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: |
   Port to use for printk debugging output.  0 - /dev/tty0, Serial Port 1/Console on the MVME712M.  1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.  2 - /dev/tty2, Serial Port 3 on the MVME712M.  3 - /dev/tty3, Serial Port 4 on the MVME712M.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optuseterm.yml b/spec/build/bsps/m68k/mvme167/optuseterm.yml
index 585bd63329..8643c42d2b 100644
--- a/spec/build/bsps/m68k/mvme167/optuseterm.yml
+++ b/spec/build/bsps/m68k/mvme167/optuseterm.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: |
   1 for using termios based console.
 enabled-by: true