findBSP for WB and WL

cmake/FindBSP.cmake

@@ -1,5 +1,6 @@
 # For information about why and how of this file: https://cmake.org/cmake/help/latest/command/find_package.html
 
+### F0 ###
 set(BSP_F0_BOARDS 
     STM32F0xx_Nucleo_32 STM32F0xx-Nucleo STM32F072B-Discovery 
     STM32F0308-Discovery STM32072B_EVAL STM32091C_EVAL
@@ -15,6 +16,7 @@ set(BSP_F0_DEVICE_STM32F0308_Discovery F030R8)
 set(BSP_F0_DEVICE_STM32072B_EVAL F072VB)
 set(BSP_F0_DEVICE_STM32091C_EVAL F091VC)
 
+### F1 ###
 set(BSP_F1_BOARDS 
     STM32F1xx_Nucleo STM32VL-Discovery STM3210C_EVAL STM3210E_EVAL
 )
@@ -28,6 +30,7 @@ set(BSP_F1_DEVICE_STM32VL_Discovery F100RB)
 set(BSP_F1_DEVICE_STM3210C_EVAL F107VC)
 set(BSP_F1_DEVICE_STM3210E_EVAL F103ZE)
 
+### F2 ###
 set(BSP_F2_BOARDS 
     STM32F2xx_Nucleo_144 STM322xG_EVAL
 )
@@ -37,6 +40,7 @@ set(BSP_F2_COMPONENTS
 set(BSP_F2_SOURCES_STM322xG_EVAL audio camera eeprom io lcd sd sram ts)
 set(BSP_F2_DEVICE_STM322xG_EVAL F207IG)
 
+### F3 ###
 set(BSP_F3_BOARDS 
     STM32F3-Discovery STM32F3xx_Nucleo_32 STM32F3xx_Nucleo_144 STM32F3xx-Nucleo
     STM32F3348-Discovery STM32303C_EVAL STM32303E_EVAL STM32373C_EVAL
@@ -55,6 +59,7 @@ set(BSP_F3_DEVICE_STM32303C_EVAL F303VC)
 set(BSP_F3_DEVICE_STM32303E_EVAL F303VE)
 set(BSP_F3_DEVICE_STM32373C_EVAL F373VC)
 
+### F4 ###
 set(BSP_F4_BOARDS 
     STM32F4-Discovery STM32F4xx_Nucleo_144 STM32F4xx-Nucleo STM32F401-Discovery
     STM32F411E-Discovery STM32F413H-Discovery STM32F429I-Discovery 
@@ -90,6 +95,7 @@ set(BSP_F4_DEVICE_STM32446E_EVAL F446ZE)
 set(BSP_F4_DEVICE_STM32469I_EVAL F469NI)
 set(BSP_F4_DEVICE_STM32469I_Discovery F469NI)
 
+### F7 ###
 set(BSP_F7_BOARDS 
     STM32F7xx_Nucleo_144 STM32F723E-Discovery STM32F769I_EVAL 
     STM32F769I-Discovery STM32F7308-Discovery STM32F7508-Discovery
@@ -115,6 +121,7 @@ set(BSP_F7_DEVICE_STM32F7508_Discovery F750N8)
 set(BSP_F7_DEVICE_STM32746G_Discovery F746NG)
 set(BSP_F7_DEVICE_STM32756G_EVAL F756NG)
 
+### G0 ###
 set(BSP_G0_BOARDS
     STM32G0xx_Nucleo STM32G0xx_Nucleo_32 STM32G071B-Discovery STM32G081B_EVAL 
     STM32G0316-Discovery
@@ -129,6 +136,7 @@ set(BSP_G0_DEVICE_STM32G071B_Discovery G071RB)
 set(BSP_G0_DEVICE_STM32G081B_EVAL G081RB)
 set(BSP_G0_DEVICE_STM32G0316_Discovery G031J6)
 
+### G4 ###
 set(BSP_G4_BOARDS
     B-G474E-DPOW1 STM32G4xx_Nucleo STM32G474E-EVAL
 )
@@ -140,6 +148,7 @@ set(BSP_G4_SOURCES_STM32G481B_EVAL audio bus env_sensor idd io lcd qspi sd smart
 set(BSP_G4_DEVICE_B_G474E_DPOW1 G474RE)
 set(BSP_G4_DEVICE_STM32G474E_EVAL G474QE)
 
+### H7 ###
 set(BSP_H7_BOARDS
     STM32H7B3I-Discovery STM32H7B3I-EVAL STM32H7xx_Nucleo STM32H743I-EVAL
     STM32H745I-Discovery STM32H747I-Discovery STM32H747I-EVAL 
@@ -170,6 +179,7 @@ set(BSP_H7_DEVICE_STM32H747I_Discovery H747XI)
 set(BSP_H7_DEVICE_STM32H747I_EVAL H743XI)
 set(BSP_H7_DEVICE_STM32H750B_Discovery H750XB)
 
+### L0 ###
 set(BSP_L0_BOARDS
     STM32L0xx_Nucleo STM32L0xx_Nucleo_32 STM32L073Z_EVAL STM32L0538-Discovery
 )
@@ -181,6 +191,7 @@ set(BSP_L0_SOURCES_STM32L0538_Discovery epd)
 set(BSP_L0_DEVICE_STM32L073Z_EVAL L073VZ)
 set(BSP_L0_DEVICE_STM32L0538_Discovery L053C8)
 
+### L1 ###
 set(BSP_L1_BOARDS
     STM32L1xx_Nucleo STM32L100C-Discovery STM32L152C-Discovery STM32L152D_EVAL
 )
@@ -193,6 +204,7 @@ set(BSP_L1_DEVICE_STM32L100C_Discovery L100RC)
 set(BSP_L1_DEVICE_STM32L152C_Discovery L152RC)
 set(BSP_L1_DEVICE_STM32L152D_EVAL L152ZD)
 
+### L4 ###
 set(BSP_L4_BOARDS 
     STM32L475E-IOT01 STM32L4P5G-Discovery STM32L4R9I_EVAL STM32L4R9I-Discovery 
     STM32L4xx_Nucleo STM32L4xx_Nucleo_32 STM32L4xx_Nucleo_144 STM32L476G_EVAL 
@@ -220,6 +232,7 @@ set(BSP_L4_DEVICE_STM32L476G_EVAL L476ZG)
 set(BSP_L4_DEVICE_STM32L476G_Discovery L476VG)
 set(BSP_L4_DEVICE_STM32L496G_Discovery L496AG)
 
+### L5 ###
 set(BSP_L5_BOARDS 
     STM32L552E_EVAL STM32L562E-Discovery STM32L5xx_Nucleo_144
 )
@@ -232,6 +245,24 @@ set(BSP_L5_SOURCES_STM32L552E_EVAL audio bus idd io lcd ospi sd sram ts usbpd_pw
 set(BSP_L5_DEVICE_STM32L562E_Discovery L562QE)
 set(BSP_L5_DEVICE_STM32L552E_EVAL L552ZE)
 
+### WB ###
+set(BSP_WB_BOARDS
+    STM32WB15CC_Nucleo STM32WB55_Nucleo STM32WB55_USBDongle STM32WB5MM_Discovery
+)
+set(BSP_WB_COMPONENTS 
+    ism330dhcx s25fl128s ssd1315 stts22h
+)
+set(BSP_WB_DIR_STM32WB5MM_Discovery STM32WB5MM-DK)
+set(BSP_WB_SOURCES_STM32WB5MM_Discovery audio bus env_sensors env_sensors_ex lcd motion_sensors motion_sensors_ex qspi)
+set(BSP_WB_DEVICE_STM32WB5MM_Discovery WB5MMG)
+
+### WL ###
+set(BSP_WL_BOARDS
+    STM32WLxx_Nucleo
+)
+
+
+
 if(NOT BSP_FIND_COMPONENTS)
     set(BSP_FIND_COMPONENTS ${STM32_SUPPORTED_FAMILIES_LONG_NAME})
 endif()
@@ -240,6 +271,17 @@ if(STM32H7 IN_LIST BSP_FIND_COMPONENTS)
     list(REMOVE_ITEM BSP_FIND_COMPONENTS STM32H7)
     list(APPEND BSP_FIND_COMPONENTS STM32H7_M7 STM32H7_M4)
 endif()
+
+if(STM32WB IN_LIST BSP_FIND_COMPONENTS)
+    list(REMOVE_ITEM BSP_FIND_COMPONENTS STM32WB)
+    list(APPEND BSP_FIND_COMPONENTS STM32WB_M4)
+endif()
+
+if(STM32WL IN_LIST BSP_FIND_COMPONENTS)
+    list(REMOVE_ITEM BSP_FIND_COMPONENTS STM32WL)
+    list(APPEND BSP_FIND_COMPONENTS STM32WL_M4 STM32WL_M0PLUS)
+endif()
+
 list(REMOVE_DUPLICATES BSP_FIND_COMPONENTS)
 
 foreach(COMP ${BSP_FIND_COMPONENTS})

cmake/FindCMSIS.cmake

@@ -3,10 +3,22 @@
 if(NOT CMSIS_FIND_COMPONENTS)
     set(CMSIS_FIND_COMPONENTS ${STM32_SUPPORTED_FAMILIES_LONG_NAME})
 endif()
+
 if(STM32H7 IN_LIST CMSIS_FIND_COMPONENTS)
     list(REMOVE_ITEM CMSIS_FIND_COMPONENTS STM32H7)
     list(APPEND CMSIS_FIND_COMPONENTS STM32H7_M7 STM32H7_M4)
 endif()
+
+if(STM32WB IN_LIST CMSIS_FIND_COMPONENTS)
+    list(REMOVE_ITEM CMSIS_FIND_COMPONENTS STM32WB)
+    list(APPEND CMSIS_FIND_COMPONENTS STM32WB_M4)
+endif()
+
+if(STM32WL IN_LIST CMSIS_FIND_COMPONENTS)
+    list(REMOVE_ITEM CMSIS_FIND_COMPONENTS STM32WL)
+    list(APPEND CMSIS_FIND_COMPONENTS STM32WL_M4 STM32WL_M0PLUS)
+endif()
+
 list(REMOVE_DUPLICATES CMSIS_FIND_COMPONENTS)
 
 include(stm32/devices)

cmake/FindHAL.cmake

@@ -240,6 +240,17 @@ if(STM32H7 IN_LIST HAL_FIND_COMPONENTS_FAMILIES)
     list(REMOVE_ITEM HAL_FIND_COMPONENTS_FAMILIES STM32H7)
     list(APPEND HAL_FIND_COMPONENTS_FAMILIES STM32H7_M7 STM32H7_M4)
 endif()
+
+if(STM32WB IN_LIST HAL_FIND_COMPONENTS_FAMILIES)
+    list(REMOVE_ITEM HAL_FIND_COMPONENTS_FAMILIES STM32WB)
+    list(APPEND HAL_FIND_COMPONENTS_FAMILIES STM32WB_M4)
+endif()
+
+if(STM32WL IN_LIST HAL_FIND_COMPONENTS_FAMILIES)
+    list(REMOVE_ITEM HAL_FIND_COMPONENTS_FAMILIES STM32WL)
+    list(APPEND HAL_FIND_COMPONENTS_FAMILIES STM32WL_M4 STM32WL_M0PLUS)
+endif()
+
 list(REMOVE_DUPLICATES HAL_FIND_COMPONENTS_FAMILIES)
 
 # when no explicit driver and driver_ll is given to find_component(HAL )