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.

18 files changed, 69 insertions, 29 deletions

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