STM32WB : change subfamily name

STM32WB50xx => STM32WB50xG
STM32WB55xx => STM32WB55xG
STM32WB5Mxx => STM32WB5MxG

targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt

@@ -1,14 +1,19 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(TARGET_STM32WB50xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32WB55xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32WB5Mxx EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32WB50xG EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32WB55xG EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32WB5MxG EXCLUDE_FROM_ALL)
 
 add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
 
 add_library(mbed-stm32wb INTERFACE)
 
+target_include_directories(mbed-stm32wb
+    INTERFACE
+        .
+)
+
 target_sources(mbed-stm32wb
     INTERFACE
         analogin_device.c
@@ -20,9 +25,4 @@ target_sources(mbed-stm32wb
         wb_sleep.c
 )
 
-target_include_directories(mbed-stm32wb
-    INTERFACE
-        .
-)
-
 target_link_libraries(mbed-stm32wb INTERFACE mbed-stm mbed-stm32wbcube-fw)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB50xG/CMakeLists.txt

@@ -3,24 +3,24 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32wb50xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb50xx.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb50xg.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32wb50xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32wb50xx.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32wb50xg.sct)
 endif()
 
-add_library(mbed-stm32wb50xx INTERFACE)
+add_library(mbed-stm32wb50xg INTERFACE)
 
-target_sources(mbed-stm32wb50xx
-    INTERFACE
-        ${STARTUP_FILE}
-)
-
-target_include_directories(mbed-stm32wb50xx
+target_include_directories(mbed-stm32wb50xg
     INTERFACE
         .
 )
 
-mbed_set_linker_script(mbed-stm32wb50xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+target_sources(mbed-stm32wb50xg
+    INTERFACE
+        ${STARTUP_FILE}
+)
 
-target_link_libraries(mbed-stm32wb50xx INTERFACE mbed-stm32wb)
+mbed_set_linker_script(mbed-stm32wb50xg ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-stm32wb50xg INTERFACE mbed-stm32wb)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB55xG/CMakeLists.txt

@@ -5,24 +5,24 @@ add_subdirectory(TARGET_NUCLEO_WB55RG EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32wb55xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb55xx.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb55xg.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32wb55xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32wb55xx.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32wb55xg.sct)
 endif()
 
-add_library(mbed-stm32wb55xx INTERFACE)
+add_library(mbed-stm32wb55xg INTERFACE)
 
-target_sources(mbed-stm32wb55xx
-    INTERFACE
-        ${STARTUP_FILE}
-)
-
-target_include_directories(mbed-stm32wb55xx
+target_include_directories(mbed-stm32wb55xg
     INTERFACE
         .
 )
 
-mbed_set_linker_script(mbed-stm32wb55xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+target_sources(mbed-stm32wb55xg
+    INTERFACE
+        ${STARTUP_FILE}
+)
 
-target_link_libraries(mbed-stm32wb55xx INTERFACE mbed-stm32wb)
+mbed_set_linker_script(mbed-stm32wb55xg ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-stm32wb55xg INTERFACE mbed-stm32wb)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB55xG/TARGET_NUCLEO_WB55RG/CMakeLists.txt

@@ -14,4 +14,4 @@ target_include_directories(mbed-nucleo-wb55rg
         .
 )
 
-target_link_libraries(mbed-nucleo-wb55rg INTERFACE mbed-stm32wb55xx)
+target_link_libraries(mbed-nucleo-wb55rg INTERFACE mbed-stm32wb55xg)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB5MxG/CMakeLists.txt

@@ -5,25 +5,25 @@ add_subdirectory(TARGET_DISCO_WB5MMG EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32wb5mxx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb5mxx.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb5mxg.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32wb5mxx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32wb5mxx.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32wb5mxg.sct)
 endif()
 
-add_library(mbed-stm32wb5mxx INTERFACE)
+add_library(mbed-stm32wb5mxg INTERFACE)
 
-target_sources(mbed-stm32wb5mxx
+target_include_directories(mbed-stm32wb5mxg
+    INTERFACE
+        .
+)
+
+target_sources(mbed-stm32wb5mxg
     INTERFACE
         ${STARTUP_FILE}
         system_clock.c
 )
 
-target_include_directories(mbed-stm32wb5mxx
-    INTERFACE
-        .
-)
+mbed_set_linker_script(mbed-stm32wb5mxg ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-mbed_set_linker_script(mbed-stm32wb5mxx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-
-target_link_libraries(mbed-stm32wb5mxx INTERFACE mbed-stm32wb)
+target_link_libraries(mbed-stm32wb5mxg INTERFACE mbed-stm32wb)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB5MxG/TARGET_DISCO_WB5MMG/CMakeLists.txt

@@ -13,4 +13,4 @@ target_include_directories(mbed-disco-wb5mmg
         .
 )
 
-target_link_libraries(mbed-disco-wb5mmg INTERFACE mbed-stm32wb5mxx)
+target_link_libraries(mbed-disco-wb5mmg INTERFACE mbed-stm32wb5mxg)

targets/targets.json

@@ -4188,13 +4188,13 @@
             "BLE"
         ]
     },
-    "MCU_STM32WB55xx": {
+    "MCU_STM32WB55xG": {
         "inherits": [
             "MCU_STM32WB"
         ],
         "public": false,
         "extra_labels_add": [
-            "STM32WB55xx"
+            "STM32WB55xG"
         ],
         "macros_add": [
             "STM32WB55xx",
@@ -4203,7 +4203,7 @@
     },
     "NUCLEO_WB55RG": {
         "inherits": [
-            "MCU_STM32WB55xx"
+            "MCU_STM32WB55xG"
         ],
         "supported_form_factors": [
             "ARDUINO_UNO"
@@ -4216,13 +4216,13 @@
         ],
         "device_name": "STM32WB55RGVx"
     },
-    "MCU_STM32WB5Mxx": {
+    "MCU_STM32WB5MxG": {
         "inherits": [
             "MCU_STM32WB"
         ],
         "public": false,
         "extra_labels_add": [
-            "STM32WB5Mxx"
+            "STM32WB5MxG"
         ],
         "macros_add": [
             "STM32WB5Mxx",
@@ -4231,7 +4231,7 @@
     },
     "DISCO_WB5MMG": {
         "inherits": [
-            "MCU_STM32WB5Mxx"
+            "MCU_STM32WB5MxG"
         ],
         "supported_form_factors": [
             "ARDUINO_UNO"