Skip to content

Commit e48963b

Browse files
committed
STM32WB : change subfamily name
STM32WB50xx => STM32WB50xG STM32WB55xx => STM32WB55xG STM32WB5Mxx => STM32WB5MxG
1 parent 376fda5 commit e48963b

34 files changed

+44
-44
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_subdirectory(TARGET_STM32WB50xx EXCLUDE_FROM_ALL)
5-
add_subdirectory(TARGET_STM32WB55xx EXCLUDE_FROM_ALL)
6-
add_subdirectory(TARGET_STM32WB5Mxx EXCLUDE_FROM_ALL)
4+
add_subdirectory(TARGET_STM32WB50xG EXCLUDE_FROM_ALL)
5+
add_subdirectory(TARGET_STM32WB55xG EXCLUDE_FROM_ALL)
6+
add_subdirectory(TARGET_STM32WB5MxG EXCLUDE_FROM_ALL)
77

88
add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
99

1010
add_library(mbed-stm32wb INTERFACE)
1111

12+
target_include_directories(mbed-stm32wb
13+
INTERFACE
14+
.
15+
)
16+
1217
target_sources(mbed-stm32wb
1318
INTERFACE
1419
analogin_device.c
@@ -20,9 +25,4 @@ target_sources(mbed-stm32wb
2025
wb_sleep.c
2126
)
2227

23-
target_include_directories(mbed-stm32wb
24-
INTERFACE
25-
.
26-
)
27-
2828
target_link_libraries(mbed-stm32wb INTERFACE mbed-stm mbed-stm32wbcube-fw)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB50xx/CMakeLists.txt renamed to targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB50xG/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33

44
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
55
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32wb50xx.S)
6-
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb50xx.ld)
6+
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb50xg.ld)
77
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
88
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32wb50xx.S)
9-
set(LINKER_FILE TOOLCHAIN_ARM/stm32wb50xx.sct)
9+
set(LINKER_FILE TOOLCHAIN_ARM/stm32wb50xg.sct)
1010
endif()
1111

12-
add_library(mbed-stm32wb50xx INTERFACE)
12+
add_library(mbed-stm32wb50xg INTERFACE)
1313

14-
target_sources(mbed-stm32wb50xx
14+
target_include_directories(mbed-stm32wb50xg
1515
INTERFACE
16-
${STARTUP_FILE}
16+
.
1717
)
1818

19-
target_include_directories(mbed-stm32wb50xx
19+
target_sources(mbed-stm32wb50xg
2020
INTERFACE
21-
.
21+
${STARTUP_FILE}
2222
)
2323

24-
mbed_set_linker_script(mbed-stm32wb50xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
24+
mbed_set_linker_script(mbed-stm32wb50xg ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
2525

26-
target_link_libraries(mbed-stm32wb50xx INTERFACE mbed-stm32wb)
26+
target_link_libraries(mbed-stm32wb50xg INTERFACE mbed-stm32wb)

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB55xx/CMakeLists.txt renamed to targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB55xG/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ add_subdirectory(TARGET_NUCLEO_WB55RG EXCLUDE_FROM_ALL)
55

66
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
77
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32wb55xx.S)
8-
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb55xx.ld)
8+
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32wb55xg.ld)
99
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1010
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32wb55xx.S)
11-
set(LINKER_FILE TOOLCHAIN_ARM/stm32wb55xx.sct)
11+
set(LINKER_FILE TOOLCHAIN_ARM/stm32wb55xg.sct)
1212
endif()
1313

14-
add_library(mbed-stm32wb55xx INTERFACE)
14+
add_library(mbed-stm32wb55xg INTERFACE)
1515

16-
target_sources(mbed-stm32wb55xx
16+
target_include_directories(mbed-stm32wb55xg
1717
INTERFACE
18-
${STARTUP_FILE}
18+
.
1919
)
2020

21-
target_include_directories(mbed-stm32wb55xx
21+
target_sources(mbed-stm32wb55xg
2222
INTERFACE
23-
.
23+
${STARTUP_FILE}
2424
)
2525

26-
mbed_set_linker_script(mbed-stm32wb55xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
26+
mbed_set_linker_script(mbed-stm32wb55xg ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
2727

28-
target_link_libraries(mbed-stm32wb55xx INTERFACE mbed-stm32wb)
28+
target_link_libraries(mbed-stm32wb55xg INTERFACE mbed-stm32wb)

0 commit comments

Comments
 (0)