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.

19 files changed, 42 insertions, 42 deletions

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