build: Replace variant patterns with a list

Replace the variant patterns in the default-by-variant list with an
explicit list of matching BSPs.

The change was tested by comparing the output of

  ./waf bspdefaults

before and after the change.

16 files changed, 30 insertions, 31 deletions

diff --git a/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml b/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml
index 8918318f51..7c1a1fa869 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml
@@ -12,10 +12,10 @@ default-by-variant:
   - powerpc/gwlcfm
 - value: 111
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 - value: 66
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   Must be defined to be the PLL multiplication factor for clock generation
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml b/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml
index ae9ed015e7..d1d037d34c 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml
@@ -12,16 +12,16 @@ default-by-variant:
   - powerpc/gwlcfm
 - value: 5566
   variants:
-  - powerpc/mpc5566.*
+  - powerpc/mpc5566evb
 - value: 5643
   variants:
-  - powerpc/mpc5643l.*
+  - powerpc/mpc5643l_evb
 - value: 5668
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 - value: 5674
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   specifies the chip type in use (e.g. 5554 for MPC5554)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml b/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml
index e60b33217e..d7cf9b927d 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml
@@ -9,13 +9,13 @@ default: 23
 default-by-variant:
 - value: null
   variants:
-  - powerpc/mpc5643l.*
+  - powerpc/mpc5643l_evb
 - value: null
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 - value: 31
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   selects the eMIOS channel for the RTEMS system tick (the default is the last channel)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml b/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml
index 3edac8e3f0..9ae42801cb 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml
@@ -9,10 +9,10 @@ default: null
 default-by-variant:
 - value: 3
   variants:
-  - powerpc/mpc5643l.*
+  - powerpc/mpc5643l_evb
 - value: 8
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 description: |
   selects the PIT channel for the RTEMS system tick (the default is the last channel)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml b/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml
index 78bc00dff8..931b97e56d 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml
@@ -12,7 +12,7 @@ default-by-variant:
   - powerpc/gwlcfm
 - value: null
   variants:
-  - powerpc/mpc5643l.*
+  - powerpc/mpc5643l_evb
 description: |
   Must be defined to set the EMIOS prescaler
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml
index fe81e18515..84df5a1dad 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml
@@ -12,10 +12,10 @@ default-by-variant:
   - powerpc/gwlcfm
 - value: 6
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 - value: 5
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   Must be defined to be the PLL predivider factor for clock generation
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml b/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml
index 70b5fd0f25..a5f7417674 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml
@@ -9,13 +9,13 @@ default: 63
 default-by-variant:
 - value: 127
   variants:
-  - powerpc/mpc5643l.*
+  - powerpc/mpc5643l_evb
 - value: 127
   variants:
-  - powerpc/mpc5566.*
+  - powerpc/mpc5566evb
 - value: 255
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   defines the maximum number of interrupt handlers
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml b/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml
index 615b68cdf9..232b759bf8 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml
@@ -8,8 +8,7 @@ copyrights:
 default: true
 default-by-variant:
 - value: false
-  variants:
-  - powerpc/mpc5674f_.*app
+  variants: []
 description: |
   if defined, do low level initialization
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml
index 46d39d959d..cc549ede34 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - powerpc/mpc5566evb.*
+  - powerpc/mpc5566evb
 description: |
   if defined, use custom settings for MPC5566EVB board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml
index 05679fadb3..83a694c193 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - powerpc/mpc5674fevb.*
+  - powerpc/mpc5674fevb
 description: |
   if defined, use custom settings for MPC5674FEVB board
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml b/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml
index 27747835fc..0c081ab189 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml
@@ -9,10 +9,10 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - powerpc/mpc5566.*
+  - powerpc/mpc5566evb
 - value: true
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   enable NULL pointer protection
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml b/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml
index 6748954449..8b4fd9a0f0 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml
@@ -12,13 +12,13 @@ default-by-variant:
   - powerpc/gwlcfm
 - value: 40000000
   variants:
-  - powerpc/mpc5643l_evb.*
+  - powerpc/mpc5643l_evb
 - value: 25000000
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 - value: 40000000
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   None
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml
index 1a339c7e72..cfba195031 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml
@@ -9,7 +9,7 @@ default: null
 default-by-variant:
 - value: 193
   variants:
-  - powerpc/mpc5566.*
+  - powerpc/mpc5566evb
 description: |
   IRQ pin for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml
index 6f8585b6e2..d770ce02ed 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml
@@ -9,7 +9,7 @@ default: null
 default-by-variant:
 - value: 186
   variants:
-  - powerpc/mpc5566.*
+  - powerpc/mpc5566evb
 description: |
   reset pin for SMSC9218I network interface
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml
index 8edffed6e9..6d4e1554f1 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml
@@ -12,10 +12,10 @@ default-by-variant:
   - powerpc/gwlcfm
 - value: 116000000
   variants:
-  - powerpc/mpc5668g.*
+  - powerpc/mpc5668g
 - value: 264000000
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   The system clock frequency in Hz.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml b/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml
index 739f139e49..293e2ed9a6 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml
@@ -9,7 +9,7 @@ default: 1
 default-by-variant:
 - value: 2
   variants:
-  - powerpc/mpc5674f.*
+  - powerpc/mpc5674fevb
 description: |
   system clock divider
 enabled-by: true