Skip to content

Commit c81d8b4

Browse files
committed
fix ci build
1 parent 430f16b commit c81d8b4

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

hw/bsp/stm32f0/family.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ function(add_board_target BOARD_TARGET)
5959
target_compile_options(${BOARD_TARGET} PUBLIC
6060
)
6161
target_compile_definitions(${BOARD_TARGET} PUBLIC
62+
CFG_EXAMPLE_MSC_READONLY
6263
)
6364

6465
update_board(${BOARD_TARGET})
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
#set(MCU_VARIANT MIMXRT1011)
2-
set(JLINK_DEVICE STM32G0B1RE)
1+
set(MCU_VARIANT stm32g0b1xx)
2+
set(JLINK_DEVICE stm32g0b1re)
33

44
set(LD_FILE_GNU ${CMAKE_CURRENT_LIST_DIR}/STM32G0B1RETx_FLASH.ld)
55

66
function(update_board TARGET)
77
target_compile_definitions(${TARGET} PUBLIC
88
STM32G0B1xx
9-
#HSE_VALUE=8000000U
109
)
1110
endfunction()

hw/bsp/stm32h7/boards/stm32h745disco/board.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ set(MCU_VARIANT stm32h745xx)
22
set(JLINK_DEVICE stm32h745xi_m7)
33

44
set(LD_FILE_GNU ${ST_CMSIS}/Source/Templates/gcc/linker/${MCU_VARIANT}_flash_CM7.ld)
5+
set(LD_FILE_IAR ${ST_CMSIS}/Source/Templates/iar/linker/${MCU_VARIANT}_flash_CM7.icf)
56

67
function(update_board TARGET)
78
target_compile_definitions(${TARGET} PUBLIC

hw/bsp/stm32h7/family.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ function(add_board_target BOARD_TARGET)
3737
# Startup & Linker script
3838
set(STARTUP_FILE_GNU ${ST_CMSIS}/Source/Templates/gcc/startup_${MCU_VARIANT}.s)
3939
set(STARTUP_FILE_IAR ${ST_CMSIS}/Source/Templates/iar/startup_${MCU_VARIANT}.s)
40-
set(LD_FILE_IAR ${ST_CMSIS}/Source/Templates/iar/linker/${MCU_VARIANT}_flash.icf)
40+
41+
if(NOT DEFINED LD_FILE_IAR)
42+
set(LD_FILE_IAR ${ST_CMSIS}/Source/Templates/iar/linker/${MCU_VARIANT}_flash.icf)
43+
endif()
4144

4245
add_library(${BOARD_TARGET} STATIC
4346
${ST_CMSIS}/Source/Templates/system_${ST_PREFIX}.c

hw/bsp/stm32l4/family.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function(family_configure_example TARGET)
110110
family_add_tinyusb(${TARGET} OPT_MCU_$(FAMILY_MCUS))
111111
target_sources(${TARGET}-tinyusb PUBLIC
112112
${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c
113-
${TOP}/src/st/stm32_fsdev/dcd_stm32_fsdev.c
113+
${TOP}/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
114114
)
115115
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
116116

0 commit comments

Comments
 (0)