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.

20 files changed, 56 insertions, 51 deletions

diff --git a/spec/build/bsps/sh/gensh1/abi.yml b/spec/build/bsps/sh/gensh1/abi.yml
index 4e3646562a..c6d8d5bacc 100644
--- a/spec/build/bsps/sh/gensh1/abi.yml
+++ b/spec/build/bsps/sh/gensh1/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -m1
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -m1
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh1/optcpuclk.yml b/spec/build/bsps/sh/gensh1/optcpuclk.yml
index 086145a786..4ccce45d6c 100644
--- a/spec/build/bsps/sh/gensh1/optcpuclk.yml
+++ b/spec/build/bsps/sh/gensh1/optcpuclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 20000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 20000000
 description: |
   cpu clock rate in HZ
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh1/optlowinit.yml b/spec/build/bsps/sh/gensh1/optlowinit.yml
index 60f16b388b..121673589c 100644
--- a/spec/build/bsps/sh/gensh1/optlowinit.yml
+++ b/spec/build/bsps/sh/gensh1/optlowinit.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: |
   If defined, selects whether 'early_hw_init()' is called from 'start.S'; 'bsp_hw_init()' is always called from 'bspstart.c'
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh1/tstgensh1.yml b/spec/build/bsps/sh/gensh1/tstgensh1.yml
index ac6e761570..1b8a2a8fd4 100644
--- a/spec/build/bsps/sh/gensh1/tstgensh1.yml
+++ b/spec/build/bsps/sh/gensh1/tstgensh1.yml
@@ -15,8 +15,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/gensh2/abi.yml b/spec/build/bsps/sh/gensh2/abi.yml
index 4bd34deb19..5eaeac1669 100644
--- a/spec/build/bsps/sh/gensh2/abi.yml
+++ b/spec/build/bsps/sh/gensh2/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -m2
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -m2
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh2/optcpuclk.yml b/spec/build/bsps/sh/gensh2/optcpuclk.yml
index 086145a786..4ccce45d6c 100644
--- a/spec/build/bsps/sh/gensh2/optcpuclk.yml
+++ b/spec/build/bsps/sh/gensh2/optcpuclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 20000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 20000000
 description: |
   cpu clock rate in HZ
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh2/optevb.yml b/spec/build/bsps/sh/gensh2/optevb.yml
index 45d1a7d0bc..d8035d6117 100644
--- a/spec/build/bsps/sh/gensh2/optevb.yml
+++ b/spec/build/bsps/sh/gensh2/optevb.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: |
   If defined, compiles code to jump-start from FLASH, without a monitor
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh2/optlowinit.yml b/spec/build/bsps/sh/gensh2/optlowinit.yml
index 60f16b388b..121673589c 100644
--- a/spec/build/bsps/sh/gensh2/optlowinit.yml
+++ b/spec/build/bsps/sh/gensh2/optlowinit.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: |
   If defined, selects whether 'early_hw_init()' is called from 'start.S'; 'bsp_hw_init()' is always called from 'bspstart.c'
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh2/tstgensh2.yml b/spec/build/bsps/sh/gensh2/tstgensh2.yml
index 664064e1a4..6bf92f4f03 100644
--- a/spec/build/bsps/sh/gensh2/tstgensh2.yml
+++ b/spec/build/bsps/sh/gensh2/tstgensh2.yml
@@ -12,8 +12,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/gensh4/abi.yml b/spec/build/bsps/sh/gensh4/abi.yml
index cc406a30b6..7289b3d527 100644
--- a/spec/build/bsps/sh/gensh4/abi.yml
+++ b/spec/build/bsps/sh/gensh4/abi.yml
@@ -7,9 +7,10 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -m4
-- -ml
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -m4
+  - -ml
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh4/optcpuclk.yml b/spec/build/bsps/sh/gensh4/optcpuclk.yml
index 086145a786..4ccce45d6c 100644
--- a/spec/build/bsps/sh/gensh4/optcpuclk.yml
+++ b/spec/build/bsps/sh/gensh4/optcpuclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 20000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 20000000
 description: |
   cpu clock rate in HZ
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh4/optcpydata.yml b/spec/build/bsps/sh/gensh4/optcpydata.yml
index 7d49b9b781..a596e4f670 100644
--- a/spec/build/bsps/sh/gensh4/optcpydata.yml
+++ b/spec/build/bsps/sh/gensh4/optcpydata.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: |
   Whether to copy data from ROM to RAM in start.S
 enabled-by: true
diff --git a/spec/build/bsps/sh/gensh4/optlowinit.yml b/spec/build/bsps/sh/gensh4/optlowinit.yml
index 2a90a73753..27de113dca 100644
--- a/spec/build/bsps/sh/gensh4/optlowinit.yml
+++ b/spec/build/bsps/sh/gensh4/optlowinit.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: |
   Whether to call early_hw_init from start.S
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/abi.yml b/spec/build/bsps/sh/shsim/abi.yml
index f5dcf145dc..2b735aea89 100644
--- a/spec/build/bsps/sh/shsim/abi.yml
+++ b/spec/build/bsps/sh/shsim/abi.yml
@@ -7,22 +7,20 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -m4
-- -ml
-default-by-variant:
-- value:
+- enabled-by: sh/simsh2e
+  value:
   - -m2e
   - -ml
-  variants:
-  - sh/simsh2e
-- value:
+- enabled-by: sh/simsh2
+  value:
   - -m2
-  variants:
-  - sh/simsh2
-- value:
+- enabled-by: sh/simsh1
+  value:
   - -m1
-  variants:
-  - sh/simsh1
+- enabled-by: true
+  value:
+  - -m4
+  - -ml
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/optcpuclk.yml b/spec/build/bsps/sh/shsim/optcpuclk.yml
index 086145a786..4ccce45d6c 100644
--- a/spec/build/bsps/sh/shsim/optcpuclk.yml
+++ b/spec/build/bsps/sh/shsim/optcpuclk.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 20000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 20000000
 description: |
   cpu clock rate in HZ
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/optlowinit.yml b/spec/build/bsps/sh/shsim/optlowinit.yml
index 60f16b388b..121673589c 100644
--- a/spec/build/bsps/sh/shsim/optlowinit.yml
+++ b/spec/build/bsps/sh/shsim/optlowinit.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: |
   If defined, selects whether 'early_hw_init()' is called from 'start.S'; 'bsp_hw_init()' is always called from 'bspstart.c'
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/tstsimsh1.yml b/spec/build/bsps/sh/shsim/tstsimsh1.yml
index 97a13626e4..ee781e6278 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh1.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh1.yml
@@ -15,8 +15,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/shsim/tstsimsh2.yml b/spec/build/bsps/sh/shsim/tstsimsh2.yml
index 97a13626e4..ee781e6278 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh2.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh2.yml
@@ -15,8 +15,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/shsim/tstsimsh2e.yml b/spec/build/bsps/sh/shsim/tstsimsh2e.yml
index 97a13626e4..ee781e6278 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh2e.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh2e.yml
@@ -15,8 +15,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/shsim/tstsimsh4.yml b/spec/build/bsps/sh/shsim/tstsimsh4.yml
index 97a13626e4..ee781e6278 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh4.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh4.yml
@@ -15,8 +15,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: