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.

9 files changed, 24 insertions, 18 deletions

diff --git a/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml b/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml
index 5266ec8549..77e1c9219e 100644
--- a/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml
@@ -9,10 +9,10 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lm3s3749.*
+  - arm/lm3s3749
 - value: true
   variants:
-  - arm/lm4f.*
+  - arm/lm4f120
 description: |
   use AHB apperture to access GPIO registers
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optgpionum.yml b/spec/build/bsps/arm/lm3s69xx/optgpionum.yml
index 05911d140c..bbccdd5a58 100644
--- a/spec/build/bsps/arm/lm3s69xx/optgpionum.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optgpionum.yml
@@ -9,13 +9,14 @@ default: 0
 default-by-variant:
 - value: 8
   variants:
-  - arm/lm3s3749.*
+  - arm/lm3s3749
 - value: 7
   variants:
-  - arm/lm3s6965.*
+  - arm/lm3s6965
+  - arm/lm3s6965_qemu
 - value: 6
   variants:
-  - arm/lm4f120.*
+  - arm/lm4f120
 description: |
   number of GPIO blocks supported by MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml b/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml
index 22199d8d59..9ca33cbe94 100644
--- a/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lm3s3749.*
+  - arm/lm3s3749
 description: |
   board has LM3S3749 MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml b/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml
index be01195f1d..6c11733729 100644
--- a/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lm3s6965.*
+  - arm/lm3s6965
+  - arm/lm3s6965_qemu
 description: |
   board has LM3S6965 MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml b/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml
index b3c59921b6..af60aee4d6 100644
--- a/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lm4f120.*
+  - arm/lm4f120
 description: |
   board has LM4F120xxx MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optssiblks.yml b/spec/build/bsps/arm/lm3s69xx/optssiblks.yml
index 551a27cbf2..3234606781 100644
--- a/spec/build/bsps/arm/lm3s69xx/optssiblks.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optssiblks.yml
@@ -9,13 +9,14 @@ default: 0
 default-by-variant:
 - value: 2
   variants:
-  - arm/lm3s3749.*
+  - arm/lm3s3749
 - value: 1
   variants:
-  - arm/lm3s6965.*
+  - arm/lm3s6965
+  - arm/lm3s6965_qemu
 - value: 4
   variants:
-  - arm/lm4f120.*
+  - arm/lm4f120
 description: |
   number of SSI blocks supported by MCU
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optsysclk.yml b/spec/build/bsps/arm/lm3s69xx/optsysclk.yml
index ffdd8d78c3..14fcbcd84d 100644
--- a/spec/build/bsps/arm/lm3s69xx/optsysclk.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optsysclk.yml
@@ -9,10 +9,12 @@ default: 0
 default-by-variant:
 - value: 50000000
   variants:
-  - arm/lm3s.*
+  - arm/lm3s3749
+  - arm/lm3s6965
+  - arm/lm3s6965_qemu
 - value: 80000000
   variants:
-  - arm/lm4f.*
+  - arm/lm4f120
 description: |
   system clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optudma.yml b/spec/build/bsps/arm/lm3s69xx/optudma.yml
index 88aae5094c..9445b273ec 100644
--- a/spec/build/bsps/arm/lm3s69xx/optudma.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optudma.yml
@@ -9,10 +9,10 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lm3s3749.*
+  - arm/lm3s3749
 - value: true
   variants:
-  - arm/lm4f.*
+  - arm/lm4f120
 description: |
   defined if MCU supports UDMA
 enabled-by: true
diff --git a/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml b/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml
index 9fe5306005..3854c6e3e9 100644
--- a/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml
+++ b/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml
@@ -9,13 +9,14 @@ default: 0x00000000
 default-by-variant:
 - value: 0x0000000e
   variants:
-  - arm/lm3s6965.*
+  - arm/lm3s6965
+  - arm/lm3s6965_qemu
 - value: 0x00000010
   variants:
-  - arm/lm3s3749.*
+  - arm/lm3s3749
 - value: 0x00000015
   variants:
-  - arm/lm4f120.*
+  - arm/lm4f120
 description: |
   crystal configuration for RCC register
 enabled-by: true