Skip to content

Commit 91c9559

Browse files
fpistmfpistm
committed
chore(wba): update cmake after variants update
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 714d6d9 commit 91c9559

File tree

3 files changed

+196
-0
lines changed

3 files changed

+196
-0
lines changed

‎cmake/boards_db.cmake‎

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73174,6 +73174,170 @@ target_compile_options(GENERIC_G4A1VETX_xusb_HSFS INTERFACE
7317473174
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
7317573175
)
7317673176

73177+
# GENERIC_H503CBTX
73178+
# -----------------------------------------------------------------------------
73179+
73180+
set(GENERIC_H503CBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H5xx/H503CB(T-U)")
73181+
set(GENERIC_H503CBTX_MAXSIZE 131072)
73182+
set(GENERIC_H503CBTX_MAXDATASIZE 32768)
73183+
set(GENERIC_H503CBTX_MCU cortex-m33)
73184+
set(GENERIC_H503CBTX_FPCONF "-")
73185+
add_library(GENERIC_H503CBTX INTERFACE)
73186+
target_compile_options(GENERIC_H503CBTX INTERFACE
73187+
"SHELL:-DSTM32H503xx "
73188+
"SHELL:"
73189+
"SHELL:"
73190+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
73191+
-mcpu=${GENERIC_H503CBTX_MCU}
73192+
)
73193+
target_compile_definitions(GENERIC_H503CBTX INTERFACE
73194+
"STM32H5xx"
73195+
"ARDUINO_GENERIC_H503CBTX"
73196+
"BOARD_NAME=\"GENERIC_H503CBTX\""
73197+
"BOARD_ID=GENERIC_H503CBTX"
73198+
"VARIANT_H=\"variant_generic.h\""
73199+
)
73200+
target_include_directories(GENERIC_H503CBTX INTERFACE
73201+
${CMAKE_CURRENT_LIST_DIR}/../system/STM32H5xx
73202+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32H5xx_HAL_Driver/Inc
73203+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32H5xx_HAL_Driver/Src
73204+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32H5xx/Include/
73205+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32H5xx/Source/Templates/gcc/
73206+
${GENERIC_H503CBTX_VARIANT_PATH}
73207+
)
73208+
73209+
target_link_options(GENERIC_H503CBTX INTERFACE
73210+
"LINKER:--default-script=${GENERIC_H503CBTX_VARIANT_PATH}/ldscript.ld"
73211+
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
73212+
"LINKER:--defsym=LD_MAX_SIZE=131072"
73213+
"LINKER:--defsym=LD_MAX_DATA_SIZE=32768"
73214+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
73215+
-mcpu=${GENERIC_H503CBTX_MCU}
73216+
)
73217+
73218+
add_library(GENERIC_H503CBTX_serial_disabled INTERFACE)
73219+
target_compile_options(GENERIC_H503CBTX_serial_disabled INTERFACE
73220+
"SHELL:"
73221+
)
73222+
add_library(GENERIC_H503CBTX_serial_generic INTERFACE)
73223+
target_compile_options(GENERIC_H503CBTX_serial_generic INTERFACE
73224+
"SHELL:-DHAL_UART_MODULE_ENABLED"
73225+
)
73226+
add_library(GENERIC_H503CBTX_serial_none INTERFACE)
73227+
target_compile_options(GENERIC_H503CBTX_serial_none INTERFACE
73228+
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
73229+
)
73230+
add_library(GENERIC_H503CBTX_usb_CDC INTERFACE)
73231+
target_compile_options(GENERIC_H503CBTX_usb_CDC INTERFACE
73232+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
73233+
)
73234+
add_library(GENERIC_H503CBTX_usb_CDCgen INTERFACE)
73235+
target_compile_options(GENERIC_H503CBTX_usb_CDCgen INTERFACE
73236+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
73237+
)
73238+
add_library(GENERIC_H503CBTX_usb_HID INTERFACE)
73239+
target_compile_options(GENERIC_H503CBTX_usb_HID INTERFACE
73240+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
73241+
)
73242+
add_library(GENERIC_H503CBTX_usb_none INTERFACE)
73243+
target_compile_options(GENERIC_H503CBTX_usb_none INTERFACE
73244+
"SHELL:"
73245+
)
73246+
add_library(GENERIC_H503CBTX_xusb_FS INTERFACE)
73247+
target_compile_options(GENERIC_H503CBTX_xusb_FS INTERFACE
73248+
"SHELL:"
73249+
)
73250+
add_library(GENERIC_H503CBTX_xusb_HS INTERFACE)
73251+
target_compile_options(GENERIC_H503CBTX_xusb_HS INTERFACE
73252+
"SHELL:-DUSE_USB_HS"
73253+
)
73254+
add_library(GENERIC_H503CBTX_xusb_HSFS INTERFACE)
73255+
target_compile_options(GENERIC_H503CBTX_xusb_HSFS INTERFACE
73256+
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
73257+
)
73258+
73259+
# GENERIC_H503CBUX
73260+
# -----------------------------------------------------------------------------
73261+
73262+
set(GENERIC_H503CBUX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H5xx/H503CB(T-U)")
73263+
set(GENERIC_H503CBUX_MAXSIZE 131072)
73264+
set(GENERIC_H503CBUX_MAXDATASIZE 32768)
73265+
set(GENERIC_H503CBUX_MCU cortex-m33)
73266+
set(GENERIC_H503CBUX_FPCONF "-")
73267+
add_library(GENERIC_H503CBUX INTERFACE)
73268+
target_compile_options(GENERIC_H503CBUX INTERFACE
73269+
"SHELL:-DSTM32H503xx "
73270+
"SHELL:"
73271+
"SHELL:"
73272+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
73273+
-mcpu=${GENERIC_H503CBUX_MCU}
73274+
)
73275+
target_compile_definitions(GENERIC_H503CBUX INTERFACE
73276+
"STM32H5xx"
73277+
"ARDUINO_GENERIC_H503CBUX"
73278+
"BOARD_NAME=\"GENERIC_H503CBUX\""
73279+
"BOARD_ID=GENERIC_H503CBUX"
73280+
"VARIANT_H=\"variant_generic.h\""
73281+
)
73282+
target_include_directories(GENERIC_H503CBUX INTERFACE
73283+
${CMAKE_CURRENT_LIST_DIR}/../system/STM32H5xx
73284+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32H5xx_HAL_Driver/Inc
73285+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32H5xx_HAL_Driver/Src
73286+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32H5xx/Include/
73287+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32H5xx/Source/Templates/gcc/
73288+
${GENERIC_H503CBUX_VARIANT_PATH}
73289+
)
73290+
73291+
target_link_options(GENERIC_H503CBUX INTERFACE
73292+
"LINKER:--default-script=${GENERIC_H503CBUX_VARIANT_PATH}/ldscript.ld"
73293+
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
73294+
"LINKER:--defsym=LD_MAX_SIZE=131072"
73295+
"LINKER:--defsym=LD_MAX_DATA_SIZE=32768"
73296+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
73297+
-mcpu=${GENERIC_H503CBUX_MCU}
73298+
)
73299+
73300+
add_library(GENERIC_H503CBUX_serial_disabled INTERFACE)
73301+
target_compile_options(GENERIC_H503CBUX_serial_disabled INTERFACE
73302+
"SHELL:"
73303+
)
73304+
add_library(GENERIC_H503CBUX_serial_generic INTERFACE)
73305+
target_compile_options(GENERIC_H503CBUX_serial_generic INTERFACE
73306+
"SHELL:-DHAL_UART_MODULE_ENABLED"
73307+
)
73308+
add_library(GENERIC_H503CBUX_serial_none INTERFACE)
73309+
target_compile_options(GENERIC_H503CBUX_serial_none INTERFACE
73310+
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
73311+
)
73312+
add_library(GENERIC_H503CBUX_usb_CDC INTERFACE)
73313+
target_compile_options(GENERIC_H503CBUX_usb_CDC INTERFACE
73314+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
73315+
)
73316+
add_library(GENERIC_H503CBUX_usb_CDCgen INTERFACE)
73317+
target_compile_options(GENERIC_H503CBUX_usb_CDCgen INTERFACE
73318+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
73319+
)
73320+
add_library(GENERIC_H503CBUX_usb_HID INTERFACE)
73321+
target_compile_options(GENERIC_H503CBUX_usb_HID INTERFACE
73322+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
73323+
)
73324+
add_library(GENERIC_H503CBUX_usb_none INTERFACE)
73325+
target_compile_options(GENERIC_H503CBUX_usb_none INTERFACE
73326+
"SHELL:"
73327+
)
73328+
add_library(GENERIC_H503CBUX_xusb_FS INTERFACE)
73329+
target_compile_options(GENERIC_H503CBUX_xusb_FS INTERFACE
73330+
"SHELL:"
73331+
)
73332+
add_library(GENERIC_H503CBUX_xusb_HS INTERFACE)
73333+
target_compile_options(GENERIC_H503CBUX_xusb_HS INTERFACE
73334+
"SHELL:-DUSE_USB_HS"
73335+
)
73336+
add_library(GENERIC_H503CBUX_xusb_HSFS INTERFACE)
73337+
target_compile_options(GENERIC_H503CBUX_xusb_HSFS INTERFACE
73338+
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
73339+
)
73340+
7317773341
# GENERIC_H503KBUX
7317873342
# -----------------------------------------------------------------------------
7317973343

‎libraries/SrcWrapper/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ add_library(SrcWrapper_bin OBJECT EXCLUDE_FROM_ALL
114114
src/HAL/stm32yyxx_hal_sd.c
115115
src/HAL/stm32yyxx_hal_sd_ex.c
116116
src/HAL/stm32yyxx_hal_sdadc.c
117+
src/HAL/stm32yyxx_hal_sdio.c
117118
src/HAL/stm32yyxx_hal_sdram.c
118119
src/HAL/stm32yyxx_hal_smartcard.c
119120
src/HAL/stm32yyxx_hal_smartcard_ex.c

‎variants/STM32WBAxx/WBA50KGU/CMakeLists.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+

0 commit comments

Comments
 (0)