diff options
| author | HiFiPhile <[email protected]> | 2025-01-27 19:27:47 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-27 19:27:47 +0100 |
| commit | 67f0d610e5f6b1dea079df88da503eb4c3681f71 (patch) | |
| tree | 32d45e03cf12c2986ae305b031b2cb35b0cb7227 /hw/bsp/stm32g4 | |
| parent | 5ca38228308271dda7fdcdeb085de9bb4d6d8f6a (diff) | |
| parent | 0d4f945bdce5bbe47feab51b2a77a26f30aac0bd (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'hw/bsp/stm32g4')
| -rw-r--r-- | hw/bsp/stm32g4/family.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/bsp/stm32g4/family.cmake b/hw/bsp/stm32g4/family.cmake index 6c4e90d40..5ec9926fe 100644 --- a/hw/bsp/stm32g4/family.cmake +++ b/hw/bsp/stm32g4/family.cmake @@ -11,7 +11,7 @@ set(CMSIS_5 ${TOP}/lib/CMSIS_5) include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake) # toolchain set up -set(CMAKE_SYSTEM_PROCESSOR cortex-m4 CACHE INTERNAL "System Processor") +set(CMAKE_SYSTEM_CPU cortex-m4 CACHE INTERNAL "System Processor") set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/build_system/cmake/toolchain/arm_${TOOLCHAIN}.cmake) set(FAMILY_MCUS STM32G4 CACHE INTERNAL "") @@ -97,15 +97,14 @@ function(family_configure_example TARGET RTOS) ) # Add TinyUSB target and port source - family_add_tinyusb(${TARGET} OPT_MCU_STM32G4 ${RTOS}) - target_sources(${TARGET}-tinyusb PUBLIC + family_add_tinyusb(${TARGET} OPT_MCU_STM32G4) + target_sources(${TARGET} PUBLIC ${TOP}/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c ${TOP}/src/portable/st/typec/typec_stm32.c ) - target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD}) + target_link_libraries(${TARGET} PUBLIC board_${BOARD}) + - # Link dependencies - target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb) # Flashing family_add_bin_hex(${TARGET}) |