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.

33 files changed, 64 insertions, 49 deletions

diff --git a/spec/build/bsps/powerpc/gen5200/optuboot.yml b/spec/build/bsps/powerpc/gen5200/optuboot.yml
index 19ed770a9f..4d44060774 100644
--- a/spec/build/bsps/powerpc/gen5200/optuboot.yml
+++ b/spec/build/bsps/powerpc/gen5200/optuboot.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - powerpc/pm520.*
+  - powerpc/pm520_cr825
+  - powerpc/pm520_ze30
 - value: true
   variants:
   - powerpc/icecube
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml b/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml
index 962584da83..0e861eed0c 100644
--- a/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml
+++ b/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - powerpc/qemuprep.*
+  - powerpc/qemuprep
+  - powerpc/qemuprep-altivec
 description: |
   Defined for QEMU BSP -- undefined for others
 enabled-by: true
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
diff --git a/spec/build/bsps/powerpc/qoriq/optbucsr.yml b/spec/build/bsps/powerpc/qoriq/optbucsr.yml
index 713902b801..269f29b976 100644
--- a/spec/build/bsps/powerpc/qoriq/optbucsr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optbucsr.yml
@@ -9,7 +9,8 @@ default: null
 default-by-variant:
 - value: 0x01400201
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   initial BUCSR value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml b/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml
index 217718a1dc..74adc5ae9d 100644
--- a/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml
+++ b/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml
@@ -9,7 +9,8 @@ default: 1
 default-by-variant:
 - value: 2
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   divider of the platform clock to get the clock most on-chip peripherals
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcachealign.yml b/spec/build/bsps/powerpc/qoriq/optcachealign.yml
index 77e30c86c7..80423556e9 100644
--- a/spec/build/bsps/powerpc/qoriq/optcachealign.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcachealign.yml
@@ -9,7 +9,8 @@ default: null
 default-by-variant:
 - value: 64
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   the cache alignment
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml b/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml
index ef4ee635ef..28566edad9 100644
--- a/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml
@@ -9,7 +9,8 @@ default: 262144
 default-by-variant:
 - value: 2097152
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   the L2 data cache size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml b/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml
index 133941ff7b..ea16d60a8b 100644
--- a/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml
@@ -9,7 +9,8 @@ default: 262144
 default-by-variant:
 - value: 2097152
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   the L2 instruction cache size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optchipnum.yml b/spec/build/bsps/powerpc/qoriq/optchipnum.yml
index f8bb14166f..6e465ac41b 100644
--- a/spec/build/bsps/powerpc/qoriq/optchipnum.yml
+++ b/spec/build/bsps/powerpc/qoriq/optchipnum.yml
@@ -9,7 +9,8 @@ default: 1020
 default-by-variant:
 - value: 0
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   chip number, e.g. 1020, 2040, 2080, 4240
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optchipser.yml b/spec/build/bsps/powerpc/qoriq/optchipser.yml
index c566b49761..29c0c01d6f 100644
--- a/spec/build/bsps/powerpc/qoriq/optchipser.yml
+++ b/spec/build/bsps/powerpc/qoriq/optchipser.yml
@@ -9,7 +9,8 @@ default: P
 default-by-variant:
 - value: T
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   chip series, e.g. 'P' or 'T'
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcpucnt.yml b/spec/build/bsps/powerpc/qoriq/optcpucnt.yml
index db805547e2..61b2048edc 100644
--- a/spec/build/bsps/powerpc/qoriq/optcpucnt.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcpucnt.yml
@@ -9,7 +9,8 @@ default: 2
 default-by-variant:
 - value: 24
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   maximum virtual processor count
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opthid0.yml b/spec/build/bsps/powerpc/qoriq/opthid0.yml
index e8ca7b735d..e733c0f9aa 100644
--- a/spec/build/bsps/powerpc/qoriq/opthid0.yml
+++ b/spec/build/bsps/powerpc/qoriq/opthid0.yml
@@ -9,7 +9,8 @@ default: null
 default-by-variant:
 - value: 0x40000000
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   initial HID0 value (EN_L2MMU_MHD is set by default on the T-series)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opthyp.yml b/spec/build/bsps/powerpc/qoriq/opthyp.yml
index ccb383c8b5..39901fed5d 100644
--- a/spec/build/bsps/powerpc/qoriq/opthyp.yml
+++ b/spec/build/bsps/powerpc/qoriq/opthyp.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   defined if the processor core has a hypervisor mode
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optmas7.yml b/spec/build/bsps/powerpc/qoriq/optmas7.yml
index 7a5c5471dd..37bd67461c 100644
--- a/spec/build/bsps/powerpc/qoriq/optmas7.yml
+++ b/spec/build/bsps/powerpc/qoriq/optmas7.yml
@@ -9,7 +9,8 @@ default: 0x00000000
 default-by-variant:
 - value: 0x0000000f
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   MAS7 value for device TLB1 entries
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optmsr.yml b/spec/build/bsps/powerpc/qoriq/optmsr.yml
index e6c754c0ae..4366503a69 100644
--- a/spec/build/bsps/powerpc/qoriq/optmsr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optmsr.yml
@@ -9,10 +9,10 @@ default: 0x02000200
 default-by-variant:
 - value: 0x82002200
   variants:
-  - powerpc/qoriq_e6500_64.*
+  - powerpc/qoriq_e6500_64
 - value: 0x02002200
   variants:
-  - powerpc/qoriq_e6500_32.*
+  - powerpc/qoriq_e6500_32
 description: |
   initial MSR value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optspefscr.yml b/spec/build/bsps/powerpc/qoriq/optspefscr.yml
index b9ccaa2bd5..f494b66cfa 100644
--- a/spec/build/bsps/powerpc/qoriq/optspefscr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optspefscr.yml
@@ -9,7 +9,8 @@ default: 0x00000000
 default-by-variant:
 - value: null
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   initial SPEFSCR value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml b/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml
index 5a2b67bf5c..9fca5dc401 100644
--- a/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml
+++ b/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml
@@ -9,7 +9,8 @@ default: 1
 default-by-variant:
 - value: 2
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   the number of threads per core
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml b/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml
index 4b9ed660b7..ac123ecb0c 100644
--- a/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml
+++ b/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml
@@ -9,7 +9,8 @@ default: 16
 default-by-variant:
 - value: 64
   variants:
-  - powerpc/qoriq_e6500.*
+  - powerpc/qoriq_e6500_32
+  - powerpc/qoriq_e6500_64
 description: |
   TLB1 entry count
 enabled-by: true