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.

14 files changed, 54 insertions, 44 deletions

diff --git a/spec/build/bsps/arm/xilinx-zynqmp/abi.yml b/spec/build/bsps/arm/xilinx-zynqmp/abi.yml
index 23c66bb5b8..b49ac81c6a 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/abi.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/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-a53
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -march=armv7-a
+  - -mthumb
+  - -mfpu=neon
+  - -mfloat-abi=hard
+  - -mtune=cortex-a53
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml b/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml
index 23b1410385..c86800df35 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/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/xilinx-zynqmp/optcacheinst.yml b/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml
index f172cc4b58..90e0e1301a 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/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/xilinx-zynqmp/optclkfastidle.yml b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
index 61333a11f1..e303a8bf9f 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
@@ -5,13 +5,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
+default:
+- enabled-by:
   - arm/lm3s6965_qemu
   - arm/realview_pbx_a9_qemu
   - arm/xilinx_zynq_a9_qemu
+  value: true
+- enabled-by: true
+  value: false
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml b/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml
index df6cd08847..77c8f30fff 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml
@@ -5,11 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 100000000
-default-by-variant:
-- value: 100000000
-  variants:
-  - arm/xilinx_zynqmp_ultra96
+default:
+- enabled-by: true
+  value: 100000000
 description: |
   Zynq UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optconirq.yml b/spec/build/bsps/arm/xilinx-zynqmp/optconirq.yml
index ecb91d81a3..ea13fa4561 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optconirq.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optconirq.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: |
   use interrupt driven mode for console devices (used by default)
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optint0len.yml b/spec/build/bsps/arm/xilinx-zynqmp/optint0len.yml
index 499f190176..433e181ee6 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optint0len.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optint0len.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00030000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00030000
 description: ''
 enabled-by: true
 format: '{:#010x}'
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optint0ori.yml b/spec/build/bsps/arm/xilinx-zynqmp/optint0ori.yml
index b4d4bb67e7..3fa03d3129 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optint0ori.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optint0ori.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00000000
 description: ''
 enabled-by: true
 format: '{:#010x}'
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optint1len.yml b/spec/build/bsps/arm/xilinx-zynqmp/optint1len.yml
index 1b76b9f19e..9f1c797366 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optint1len.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optint1len.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x0000fe00
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x0000fe00
 description: ''
 enabled-by: true
 format: '{:#010x}'
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optint1ori.yml b/spec/build/bsps/arm/xilinx-zynqmp/optint1ori.yml
index abf15b1043..3ef196e567 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optint1ori.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optint1ori.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0xffff0000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0xffff0000
 description: ''
 enabled-by: true
 format: '{:#010x}'
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optnocachelen.yml b/spec/build/bsps/arm/xilinx-zynqmp/optnocachelen.yml
index ce56cfd92b..f35686d1c9 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optnocachelen.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/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/xilinx-zynqmp/optramlen.yml b/spec/build/bsps/arm/xilinx-zynqmp/optramlen.yml
index fe13f5305a..5cb5e805cf 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optramlen.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optramlen.yml
@@ -7,11 +7,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x10000000
-default-by-variant:
-- value: 0x80000000
-  variants:
-  - arm/xilinx_zynqmp_ultra96
+default:
+- enabled-by: arm/xilinx_zynqmp_ultra96
+  value: 0x80000000
+- enabled-by: true
+  value: 0x10000000
 description: |
   override a BSP's default RAM length
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optramori.yml b/spec/build/bsps/arm/xilinx-zynqmp/optramori.yml
index cba1092058..6269b662e0 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optramori.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optramori.yml
@@ -8,8 +8,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: ''
 enabled-by: true
 format: '{:#010x}'
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optresetvec.yml b/spec/build/bsps/arm/xilinx-zynqmp/optresetvec.yml
index efd1ea2b2a..bac5c79627 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optresetvec.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/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