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.

15 files changed, 30 insertions, 16 deletions

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