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.

76 files changed, 203 insertions, 122 deletions

diff --git a/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml b/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml
index b800b20428..61333a11f1 100644
--- a/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml
+++ b/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml
@@ -9,7 +9,9 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optam335x.yml b/spec/build/bsps/arm/beagle/optam335x.yml
index 2453aae088..6641cef403 100644
--- a/spec/build/bsps/arm/beagle/optam335x.yml
+++ b/spec/build/bsps/arm/beagle/optam335x.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/beaglebone.*
+  - arm/beagleboneblack
+  - arm/beaglebonewhite
 description: |
   true if SOC is AM335X
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optdebug.yml b/spec/build/bsps/arm/beagle/optdebug.yml
index 54f6c55f9a..8a5dc7ee96 100644
--- a/spec/build/bsps/arm/beagle/optdebug.yml
+++ b/spec/build/bsps/arm/beagle/optdebug.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: false
   variants:
-  - arm/beaglebone.*
+  - arm/beagleboneblack
+  - arm/beaglebonewhite
 description: |
   Enable BBB debug
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optdm3730.yml b/spec/build/bsps/arm/beagle/optdm3730.yml
index 3dd60260f3..4161ee29f1 100644
--- a/spec/build/bsps/arm/beagle/optdm3730.yml
+++ b/spec/build/bsps/arm/beagle/optdm3730.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/beagleboard.*
+  - arm/beagleboardorig
+  - arm/beagleboardxm
 description: |
   true if SOC is DM3730
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcachedata.yml b/spec/build/bsps/arm/imx/optcachedata.yml
index 1664b0fc31..23b1410385 100644
--- a/spec/build/bsps/arm/imx/optcachedata.yml
+++ b/spec/build/bsps/arm/imx/optcachedata.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable data cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcacheinst.yml b/spec/build/bsps/arm/imx/optcacheinst.yml
index b191133af9..f172cc4b58 100644
--- a/spec/build/bsps/arm/imx/optcacheinst.yml
+++ b/spec/build/bsps/arm/imx/optcacheinst.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable instruction cache
 enabled-by: true
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
diff --git a/spec/build/bsps/arm/lpc24xx/optcclk.yml b/spec/build/bsps/arm/lpc24xx/optcclk.yml
index aacf2192c2..e9700ce101 100644
--- a/spec/build/bsps/arm/lpc24xx/optcclk.yml
+++ b/spec/build/bsps/arm/lpc24xx/optcclk.yml
@@ -9,16 +9,20 @@ default: 72000000
 default-by-variant:
 - value: 96000000
   variants:
-  - arm/lpc17xx_ea.*
+  - arm/lpc17xx_ea_ram
+  - arm/lpc17xx_ea_rom_int
 - value: 96000000
   variants:
-  - arm/lpc40xx_ea.*
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
 - value: 58982400
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 - value: 51612800
   variants:
-  - arm/lpc24xx_plx800_.*
+  - arm/lpc24xx_plx800_ram
+  - arm/lpc24xx_plx800_rom_int
 description: |
   CPU clock in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optdmachn.yml b/spec/build/bsps/arm/lpc24xx/optdmachn.yml
index 1a67589bfc..f1f57dca60 100644
--- a/spec/build/bsps/arm/lpc24xx/optdmachn.yml
+++ b/spec/build/bsps/arm/lpc24xx/optdmachn.yml
@@ -9,10 +9,17 @@ default: 2
 default-by-variant:
 - value: 8
   variants:
-  - arm/lpc17.*
+  - arm/lpc1768_mbed
+  - arm/lpc1768_mbed_ahb_ram
+  - arm/lpc1768_mbed_ahb_ram_eth
+  - arm/lpc17xx_ea_ram
+  - arm/lpc17xx_ea_rom_int
+  - arm/lpc17xx_plx800_ram
+  - arm/lpc17xx_plx800_rom_int
 - value: 8
   variants:
-  - arm/lpc40.*
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
 description: |
   DMA channel count
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml b/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml
index 8851dadfa7..36ff19f07b 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml
@@ -9,10 +9,12 @@ default: 1
 default-by-variant:
 - value: 2
   variants:
-  - arm/lpc17xx_ea.*
+  - arm/lpc17xx_ea_ram
+  - arm/lpc17xx_ea_rom_int
 - value: 2
   variants:
-  - arm/lpc40xx_ea.*
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
 description: |
   clock divider for EMCCLK (EMCCLK = CCLK / EMCCLKDIV)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml b/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml
index de40eca73a..c6162af143 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml
@@ -9,10 +9,10 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lpc17xx_ea_rom_.*
+  - arm/lpc17xx_ea_rom_int
 - value: true
   variants:
-  - arm/lpc40xx_ea_rom_.*
+  - arm/lpc40xx_ea_rom_int
 description: |
   enable ISSI IS42S32800B configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml b/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml
index e7ad228709..71d2b38f27 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*_plx800_rom_.*
+  - arm/lpc17xx_plx800_rom_int
+  - arm/lpc24xx_plx800_rom_int
 description: |
   enable ISSI IS42S32800D7 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml b/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml
index 40a4bfbf71..02f233165c 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lpc24xx_ncs_rom_.*
+  - arm/lpc24xx_ncs_rom_ext
+  - arm/lpc24xx_ncs_rom_int
 description: |
   enable M29W160E configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml b/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml
index a32c1a3eb6..66aa8c5cad 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*_plx800_rom_.*
+  - arm/lpc17xx_plx800_rom_int
+  - arm/lpc24xx_plx800_rom_int
 description: |
   enable M29W320E70 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml b/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml
index ab6f25fef8..02b92e0710 100644
--- a/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml
+++ b/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lpc24xx_ncs_rom_.*
+  - arm/lpc24xx_ncs_rom_ext
+  - arm/lpc24xx_ncs_rom_int
 description: |
   enable Micron MT48LC4M16A2 configuration for EMC
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optethrmii.yml b/spec/build/bsps/arm/lpc24xx/optethrmii.yml
index c7c3627c82..6dc25d0d86 100644
--- a/spec/build/bsps/arm/lpc24xx/optethrmii.yml
+++ b/spec/build/bsps/arm/lpc24xx/optethrmii.yml
@@ -9,7 +9,10 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*_ea_.*
+  - arm/lpc17xx_ea_ram
+  - arm/lpc17xx_ea_rom_int
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
 description: |
   enable RMII for Ethernet
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optheapext.yml b/spec/build/bsps/arm/lpc24xx/optheapext.yml
index b485eb6cc3..90acde9447 100644
--- a/spec/build/bsps/arm/lpc24xx/optheapext.yml
+++ b/spec/build/bsps/arm/lpc24xx/optheapext.yml
@@ -9,7 +9,8 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 description: |
   enable heap extend by Ethernet and USB regions
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optoscmain.yml b/spec/build/bsps/arm/lpc24xx/optoscmain.yml
index ec529345a1..2a483213de 100644
--- a/spec/build/bsps/arm/lpc24xx/optoscmain.yml
+++ b/spec/build/bsps/arm/lpc24xx/optoscmain.yml
@@ -9,7 +9,8 @@ default: 12000000
 default-by-variant:
 - value: 3686400
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 description: |
   main oscillator frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optotgi2c.yml b/spec/build/bsps/arm/lpc24xx/optotgi2c.yml
index 574dcf3430..3e7baeadbc 100644
--- a/spec/build/bsps/arm/lpc24xx/optotgi2c.yml
+++ b/spec/build/bsps/arm/lpc24xx/optotgi2c.yml
@@ -9,10 +9,12 @@ default: 0x00000000
 default-by-variant:
 - value: 0x0000005e
   variants:
-  - arm/lpc17xx_ea.*
+  - arm/lpc17xx_ea_ram
+  - arm/lpc17xx_ea_rom_int
 - value: 0x0000005e
   variants:
-  - arm/lpc40xx_ea.*
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
 description: |
   USB OTG transceiver I2C address used by USB stack
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml b/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml
index 296486c78f..bc4984bc3d 100644
--- a/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml
+++ b/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml
@@ -9,10 +9,12 @@ default: 1
 default-by-variant:
 - value: 2
   variants:
-  - arm/lpc17xx_ea.*
+  - arm/lpc17xx_ea_ram
+  - arm/lpc17xx_ea_rom_int
 - value: 2
   variants:
-  - arm/lpc40xx_ea.*
+  - arm/lpc40xx_ea_ram
+  - arm/lpc40xx_ea_rom_int
 description: |
   clock divider for default PCLK (PCLK = CCLK / PCLKDIV)
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optstopeth.yml b/spec/build/bsps/arm/lpc24xx/optstopeth.yml
index 60f07f9a06..2baf76da8c 100644
--- a/spec/build/bsps/arm/lpc24xx/optstopeth.yml
+++ b/spec/build/bsps/arm/lpc24xx/optstopeth.yml
@@ -9,7 +9,8 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 description: |
   stop Ethernet controller at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optstopusb.yml b/spec/build/bsps/arm/lpc24xx/optstopusb.yml
index 2f2bfc5c93..b895ff7df3 100644
--- a/spec/build/bsps/arm/lpc24xx/optstopusb.yml
+++ b/spec/build/bsps/arm/lpc24xx/optstopusb.yml
@@ -9,7 +9,8 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 description: |
   stop USB controller at start-up to avoid DMA interference
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml b/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml
index c1f133f08f..055f8bbbee 100644
--- a/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml
@@ -9,7 +9,10 @@ default: false
 default-by-variant:
 - value: false
   variants:
-  - arm/.*_plx800_.*
+  - arm/lpc17xx_plx800_ram
+  - arm/lpc17xx_plx800_rom_int
+  - arm/lpc24xx_plx800_ram
+  - arm/lpc24xx_plx800_rom_int
 description: |
   configuration for UART 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml b/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml
index 3e523147ca..0f9bbad26b 100644
--- a/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml
@@ -9,13 +9,19 @@ default: false
 default-by-variant:
 - value: false
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 - value: false
   variants:
-  - arm/lpc24xx_ncs_.*
+  - arm/lpc24xx_ncs_ram
+  - arm/lpc24xx_ncs_rom_ext
+  - arm/lpc24xx_ncs_rom_int
 - value: false
   variants:
-  - arm/.*_plx800_.*
+  - arm/lpc17xx_plx800_ram
+  - arm/lpc17xx_plx800_rom_int
+  - arm/lpc24xx_plx800_ram
+  - arm/lpc24xx_plx800_rom_int
 description: |
   configuration for UART 2
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml b/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml
index 2af84c927d..991be593f3 100644
--- a/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml
+++ b/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml
@@ -9,10 +9,13 @@ default: false
 default-by-variant:
 - value: false
   variants:
-  - arm/lpc23.*
+  - arm/lpc2362
+  - arm/lpc23xx_tli800
 - value: false
   variants:
-  - arm/lpc24xx_ncs_.*
+  - arm/lpc24xx_ncs_ram
+  - arm/lpc24xx_ncs_rom_ext
+  - arm/lpc24xx_ncs_rom_int
 description: |
   configuration for UART 3
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optotgi2c.yml b/spec/build/bsps/arm/lpc32xx/optotgi2c.yml
index 0931bda7ca..2f7d54425c 100644
--- a/spec/build/bsps/arm/lpc32xx/optotgi2c.yml
+++ b/spec/build/bsps/arm/lpc32xx/optotgi2c.yml
@@ -9,7 +9,9 @@ default: 0x00000000
 default-by-variant:
 - value: 0x00000058
   variants:
-  - arm/lpc32xx_mzx.*
+  - arm/lpc32xx_mzx
+  - arm/lpc32xx_mzx_stage_1
+  - arm/lpc32xx_mzx_stage_2
 description: |
   USB OTG transceiver I2C address used by USB stack
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optotgvbus.yml b/spec/build/bsps/arm/lpc32xx/optotgvbus.yml
index 0d9d6b65f5..e5d2563a7b 100644
--- a/spec/build/bsps/arm/lpc32xx/optotgvbus.yml
+++ b/spec/build/bsps/arm/lpc32xx/optotgvbus.yml
@@ -9,7 +9,9 @@ default: false
 default-by-variant:
 - value: USB_OTG_VBUS_POWER_WITH_CHARGE_PUMP
   variants:
-  - arm/lpc32xx_mzx.*
+  - arm/lpc32xx_mzx
+  - arm/lpc32xx_mzx_stage_1
+  - arm/lpc32xx_mzx_stage_2
 description: |
   USB OTG transceiver VBUS policy
 enabled-by: true
diff --git a/spec/build/bsps/arm/lpc32xx/optscratchsz.yml b/spec/build/bsps/arm/lpc32xx/optscratchsz.yml
index c54f1ae7b3..ad8473d57d 100644
--- a/spec/build/bsps/arm/lpc32xx/optscratchsz.yml
+++ b/spec/build/bsps/arm/lpc32xx/optscratchsz.yml
@@ -9,7 +9,9 @@ default: 0
 default-by-variant:
 - value: 4096
   variants:
-  - arm/lpc32xx_mzx.*
+  - arm/lpc32xx_mzx
+  - arm/lpc32xx_mzx_stage_1
+  - arm/lpc32xx_mzx_stage_2
 description: |
   size of scratch area
 enabled-by: true
diff --git a/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml b/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml
index 1664b0fc31..23b1410385 100644
--- a/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml
+++ b/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable data cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml b/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml
index b191133af9..f172cc4b58 100644
--- a/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml
+++ b/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable instruction cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml b/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml
index 8d78c9ce6a..8cca180892 100644
--- a/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml
+++ b/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml
@@ -9,7 +9,9 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*qemu.*
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   If defined, then do the clock tick processing on the boot processor on behalf of all other processors.
 enabled-by: true
diff --git a/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml b/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml
index e4624223eb..61333a11f1 100644
--- a/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml
+++ b/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml
@@ -9,7 +9,9 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*qemu.*
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/opteni2c1.yml b/spec/build/bsps/arm/stm32f4/opteni2c1.yml
index e200c81623..ab8dd78926 100644
--- a/spec/build/bsps/arm/stm32f4/opteni2c1.yml
+++ b/spec/build/bsps/arm/stm32f4/opteni2c1.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/stm32f1.*
+  - arm/stm32f105rc
 description: |
   enable I2C 1
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optf10xxx.yml b/spec/build/bsps/arm/stm32f4/optf10xxx.yml
index 54f1418cf9..a1cc76ff37 100644
--- a/spec/build/bsps/arm/stm32f4/optf10xxx.yml
+++ b/spec/build/bsps/arm/stm32f4/optf10xxx.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/stm32f1.*
+  - arm/stm32f105rc
 description: |
   Chip belongs to the STM32F10XXX family.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optf4xxxx.yml b/spec/build/bsps/arm/stm32f4/optf4xxxx.yml
index 66604f249a..891aacc3c3 100644
--- a/spec/build/bsps/arm/stm32f4/optf4xxxx.yml
+++ b/spec/build/bsps/arm/stm32f4/optf4xxxx.yml
@@ -9,7 +9,7 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/stm32f4.*
+  - arm/stm32f4
 description: |
   Chip belongs to the STM32F4XXXX family.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/opthclk.yml b/spec/build/bsps/arm/stm32f4/opthclk.yml
index 7f315f12b2..b827fffe33 100644
--- a/spec/build/bsps/arm/stm32f4/opthclk.yml
+++ b/spec/build/bsps/arm/stm32f4/opthclk.yml
@@ -9,7 +9,7 @@ default: 16000000
 default-by-variant:
 - value: 8000000
   variants:
-  - arm/stm32f1.*
+  - arm/stm32f105rc
 description: |
   HCLK frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optpclk1.yml b/spec/build/bsps/arm/stm32f4/optpclk1.yml
index 9ac285b0bc..79aafa89a9 100644
--- a/spec/build/bsps/arm/stm32f4/optpclk1.yml
+++ b/spec/build/bsps/arm/stm32f4/optpclk1.yml
@@ -9,7 +9,7 @@ default: 16000000
 default-by-variant:
 - value: 8000000
   variants:
-  - arm/stm32f1.*
+  - arm/stm32f105rc
 description: |
   PCLK1 frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optpclk2.yml b/spec/build/bsps/arm/stm32f4/optpclk2.yml
index e51eeaf36f..43ce9f9c04 100644
--- a/spec/build/bsps/arm/stm32f4/optpclk2.yml
+++ b/spec/build/bsps/arm/stm32f4/optpclk2.yml
@@ -9,7 +9,7 @@ default: 16000000
 default-by-variant:
 - value: 8000000
   variants:
-  - arm/stm32f1.*
+  - arm/stm32f105rc
 description: |
   PCLK2 frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32f4/optsysclk.yml b/spec/build/bsps/arm/stm32f4/optsysclk.yml
index 5f08d4ecde..9dd081d475 100644
--- a/spec/build/bsps/arm/stm32f4/optsysclk.yml
+++ b/spec/build/bsps/arm/stm32f4/optsysclk.yml
@@ -9,7 +9,7 @@ default: 16000000
 default-by-variant:
 - value: 8000000
   variants:
-  - arm/stm32f1.*
+  - arm/stm32f105rc
 description: |
   SYSCLK frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/abi.yml b/spec/build/bsps/arm/stm32h7/abi.yml
index 1f48596190..27da264d03 100644
--- a/spec/build/bsps/arm/stm32h7/abi.yml
+++ b/spec/build/bsps/arm/stm32h7/abi.yml
@@ -18,8 +18,8 @@ default-by-variant:
   - -mfpu=fpv4-sp-d16
   - -mfloat-abi=hard
   variants:
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval-m4
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optbootcore.yml b/spec/build/bsps/arm/stm32h7/optbootcore.yml
index ad50f8ef77..c248939bbe 100644
--- a/spec/build/bsps/arm/stm32h7/optbootcore.yml
+++ b/spec/build/bsps/arm/stm32h7/optbootcore.yml
@@ -13,12 +13,12 @@ default: BOOT_CORE_DEFINE_NOT_NEEDED
 default-by-variant:
 - value: CORE_CM7
   variants:
-  - arm/stm32h757i-eval
   - arm/stm32h747i-disco
+  - arm/stm32h757i-eval
 - value: CORE_CM4
   variants:
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval-m4
 description: |
   Select the boot core. Possible values are CORE_CM7 and CORE_CM4
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart4.yml b/spec/build/bsps/arm/stm32h7/optenuart4.yml
index ab49af31f9..b95b2372f7 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart4.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart4.yml
@@ -9,10 +9,10 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
 description: |
   Enable UART4 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart5.yml b/spec/build/bsps/arm/stm32h7/optenuart5.yml
index 502e02c61d..db70f25470 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart5.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart5.yml
@@ -9,11 +9,11 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable UART5 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart7.yml b/spec/build/bsps/arm/stm32h7/optenuart7.yml
index fb061158cd..6fdc57cec8 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart7.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart7.yml
@@ -9,11 +9,11 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable UART7 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart8.yml b/spec/build/bsps/arm/stm32h7/optenuart8.yml
index 74de622e09..0dc550d701 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart8.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart8.yml
@@ -9,9 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
   - arm/stm32h757i-eval
   - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable UART8 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenuart9.yml b/spec/build/bsps/arm/stm32h7/optenuart9.yml
index af0d2e037b..9c364b7fec 100644
--- a/spec/build/bsps/arm/stm32h7/optenuart9.yml
+++ b/spec/build/bsps/arm/stm32h7/optenuart9.yml
@@ -9,11 +9,11 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable UART9 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart10.yml b/spec/build/bsps/arm/stm32h7/optenusart10.yml
index c44bffad73..a23ce86e7e 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart10.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart10.yml
@@ -9,11 +9,11 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable USART10 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart3.yml b/spec/build/bsps/arm/stm32h7/optenusart3.yml
index a0027c8266..48f5ce7e9f 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart3.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart3.yml
@@ -9,11 +9,11 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable USART3 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optenusart6.yml b/spec/build/bsps/arm/stm32h7/optenusart6.yml
index 7c4e9aee5b..1090bbce39 100644
--- a/spec/build/bsps/arm/stm32h7/optenusart6.yml
+++ b/spec/build/bsps/arm/stm32h7/optenusart6.yml
@@ -9,11 +9,11 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Enable USART6 device in console driver.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optlinkcmds.yml b/spec/build/bsps/arm/stm32h7/optlinkcmds.yml
index 59d4354ae2..ed10fe94d1 100644
--- a/spec/build/bsps/arm/stm32h7/optlinkcmds.yml
+++ b/spec/build/bsps/arm/stm32h7/optlinkcmds.yml
@@ -9,12 +9,12 @@ default: linkcmds.sdram
 default-by-variant:
 - value: linkcmds.flash
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
+  - arm/nucleo-h743zi
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
-  - arm/nucleo-h743zi
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   The default linker command file.  Must be either linkcmds.flash,
   linkcmds.sdram, linkcmds.sram, linkcmds.sram_sdram
diff --git a/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml b/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml
index c98cb691e9..2e97ba5659 100644
--- a/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml
@@ -9,8 +9,8 @@ default: 0x08000000
 default-by-variant:
 - value: 0x08100000
   variants:
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval-m4
 description: |
   Origin address of the internal flash.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemflashsz.yml b/spec/build/bsps/arm/stm32h7/optmemflashsz.yml
index 3ed50219f7..c8eb11f320 100644
--- a/spec/build/bsps/arm/stm32h7/optmemflashsz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemflashsz.yml
@@ -9,8 +9,8 @@ default: 0x00200000
 default-by-variant:
 - value: 0x00100000
   variants:
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval-m4
 description: |
   Size of the internal flash in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml b/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml
index 02d666a1d9..0a554d1461 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml
@@ -9,12 +9,12 @@ default: 0x02000000
 default-by-variant:
 - value: 0x00000000
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
+  - arm/nucleo-h743zi
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
-  - arm/nucleo-h743zi
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Size of the SDRAM 1 in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml b/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml
index a08d4e1f20..ccd026fc4e 100644
--- a/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml
+++ b/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml
@@ -9,10 +9,10 @@ default: 0x00000000
 default-by-variant:
 - value: 0x02000000
   variants:
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
 description: |
   Size of the SDRAM 2 in bytes.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optpwrsupply.yml b/spec/build/bsps/arm/stm32h7/optpwrsupply.yml
index 9270eedbd4..6534cf6143 100644
--- a/spec/build/bsps/arm/stm32h7/optpwrsupply.yml
+++ b/spec/build/bsps/arm/stm32h7/optpwrsupply.yml
@@ -9,11 +9,11 @@ default: PWR_LDO_SUPPLY
 default-by-variant:
 - value: PWR_DIRECT_SMPS_SUPPLY
   variants:
-  - arm/stm32h7b3i-dk
-  - arm/stm32h757i-eval
-  - arm/stm32h757i-eval-m4
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h757i-eval
+  - arm/stm32h757i-eval-m4
+  - arm/stm32h7b3i-dk
 description: |
   Board power supply mechanism configuration. WARNING: wrong configuration here
   may result in your board being unaccessible using ST-Link interface! Please
diff --git a/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml b/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml
index b0d3d86a6c..e0f39814e8 100644
--- a/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml
@@ -9,9 +9,9 @@ default: GPIO_AF4_USART1
 default-by-variant:
 - value: GPIO_AF7_USART1
   variants:
-  - arm/stm32h7b3i-dk
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h7b3i-dk
 description: |
   Alternate function mapping for the USART1 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml b/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml
index b8920d9276..cc81ce408b 100644
--- a/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml
@@ -9,9 +9,9 @@ default: ( GPIO_PIN_14 | GPIO_PIN_15 )
 default-by-variant:
 - value: ( GPIO_PIN_9 | GPIO_PIN_10 )
   variants:
-  - arm/stm32h7b3i-dk
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h7b3i-dk
 description: |
   GPIO pins used for the USART1 pin configuration.
 enabled-by: true
diff --git a/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml b/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml
index 79e8ab02f2..890579b9f8 100644
--- a/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml
+++ b/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml
@@ -9,9 +9,9 @@ default: GPIOD
 default-by-variant:
 - value: GPIOA
   variants:
-  - arm/stm32h7b3i-dk
   - arm/stm32h747i-disco
   - arm/stm32h747i-disco-m4
+  - arm/stm32h7b3i-dk
 - value: GPIOB
   variants:
   - arm/stm32h757i-eval
diff --git a/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml b/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml
index 0b10b47bc2..39cb972a74 100644
--- a/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml
@@ -9,10 +9,10 @@ default: 100000000
 default-by-variant:
 - value: 333333333
   variants:
-  - arm/xilinx_zynq_zc702.*
+  - arm/xilinx_zynq_zc702
 - value: 666666667
   variants:
-  - arm/xilinx_zynq_zedboard.*
+  - arm/xilinx_zynq_zedboard
 description: |
   ARM Cortex-A9 MPCore PERIPHCLK clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml b/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml
index 1664b0fc31..23b1410385 100644
--- a/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable data cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml b/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml
index b191133af9..f172cc4b58 100644
--- a/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable instruction cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml b/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml
index 1f93f52a8a..57b7187cdf 100644
--- a/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml
@@ -9,10 +9,10 @@ default: 111111111
 default-by-variant:
 - value: 111111111
   variants:
-  - arm/xilinx_zynq_zc702.*
+  - arm/xilinx_zynq_zc702
 - value: 111111111
   variants:
-  - arm/xilinx_zynq_zedboard.*
+  - arm/xilinx_zynq_zedboard
 description: |
   Zynq cpu_1x clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml b/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml
index b800b20428..61333a11f1 100644
--- a/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml
@@ -9,7 +9,9 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml b/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml
index 7d69273eb2..56a6056687 100644
--- a/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml
@@ -9,10 +9,10 @@ default: 50000000
 default-by-variant:
 - value: 50000000
   variants:
-  - arm/xilinx_zynq_zc702.*
+  - arm/xilinx_zynq_zc702
 - value: 50000000
   variants:
-  - arm/xilinx_zynq_zedboard.*
+  - arm/xilinx_zynq_zedboard
 description: |
   Zynq UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml b/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml
index 1664b0fc31..23b1410385 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable data cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml b/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml
index b191133af9..f172cc4b58 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml
@@ -9,7 +9,9 @@ default: true
 default-by-variant:
 - value: false
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   enable instruction cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
index b800b20428..61333a11f1 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml
@@ -9,7 +9,9 @@ default: false
 default-by-variant:
 - value: true
   variants:
-  - arm/.*qemu
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml b/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml
index a2def36606..df6cd08847 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml
@@ -9,7 +9,7 @@ default: 100000000
 default-by-variant:
 - value: 100000000
   variants:
-  - arm/xilinx_zynqmp_ultra96.*
+  - arm/xilinx_zynqmp_ultra96
 description: |
   Zynq UART clock frequency in Hz
 enabled-by: true