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.

10 files changed, 35 insertions, 60 deletions

diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
index 59b5f922d4..8f514ca791 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/abi.yml
@@ -7,16 +7,17 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
-- -mcpu=cortex-a53
-- -mno-outline-atomics
-default-by-variant:
-- value:
+- enabled-by:
+  - aarch64/xilinx_zynqmp_ilp32_qemu
+  - aarch64/xilinx_zynqmp_ilp32_zu3eg
+  value:
   - -mcpu=cortex-a53
   - -mno-outline-atomics
   - -mabi=ilp32
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a53
+  - -mno-outline-atomics
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml
index 1005594abe..c3793e9aae 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml
@@ -6,20 +6,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 On-Line Applications Research (OAR)
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 111111111
-default-by-variant:
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+default:
+- enabled-by: true
+  value: 111111111
 description: |
   ZynqMP i2c0 clock frequency in Hz. This is the frequency after the signal
   has been processed using the values passed to the I2C0_REF_CTRL register.
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml
index f1b26578e0..12974d2694 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml
@@ -6,20 +6,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2021 On-Line Applications Research (OAR)
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 111111111
-default-by-variant:
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_qemu
-- value: 111111111
-  variants:
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+default:
+- enabled-by: true
+  value: 111111111
 description: |
   ZynqMP i2c1 clock frequency in Hz. This is the frequency after the signal
   has been processed using the values passed to the I2C1_REF_CTRL register.
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml
index 24f232e711..5cec0d2188 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml
@@ -5,15 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 100000000
-default-by-variant:
-- value: 100000000
-  variants:
-  - aarch64/xilinx_zynqmp_ilp32_qemu
-  - aarch64/xilinx_zynqmp_ilp32_zu3eg
-  - aarch64/xilinx_zynqmp_lp64_cfc400x
-  - aarch64/xilinx_zynqmp_lp64_qemu
-  - aarch64/xilinx_zynqmp_lp64_zu3eg
+default:
+- enabled-by: true
+  value: 100000000
 description: |
   Zynq UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
index 3e89085eb3..869181a95e 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml
@@ -7,13 +7,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x00008000
-default-by-variant:
-- value: 0x00000000
-  variants:
+default:
+- enabled-by:
   - aarch64/xilinx_zynqmp_ilp32_zu3eg
   - aarch64/xilinx_zynqmp_lp64_cfc400x
   - aarch64/xilinx_zynqmp_lp64_zu3eg
+  value: 0x00000000
+- enabled-by: true
+  value: 0x00008000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml
index 3164c7b63d..68aa5dc9ab 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optnocachelen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-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/aarch64/xilinx-zynqmp/optramlen.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml
index 4599773985..9f488afd10 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x10000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x10000000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
index c67358f0d5..c4d33094fb 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml
@@ -7,13 +7,14 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x40018000
-default-by-variant:
-- value: 0x10000000
-  variants:
+default:
+- enabled-by:
   - aarch64/xilinx_zynqmp_ilp32_zu3eg
   - aarch64/xilinx_zynqmp_lp64_cfc400x
   - aarch64/xilinx_zynqmp_lp64_zu3eg
+  value: 0x10000000
+- enabled-by: true
+  value: 0x40018000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
index c8a258acfe..a3d8c9810d 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
@@ -38,8 +38,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
index 894819cd01..15cb9697ed 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/tstzu3eg.yml
@@ -9,8 +9,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []