GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-01-14 05:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake: rename STM32G0B1XK -> STM32G0B1xx

Browse Source 
According to DS13560 Rev 4, 7 Ordering information, there is no
STM32G0B1XK "K" model. Rename each occurrence of STM32G0B1XK to
STM32G0B1xx

Fixes: e8d82ef7ae01 ("Add the CMake files to support the STM32G0")
Closes: https://github.com/candle-usb/candleLight_fw/issues/174
This commit is contained in:
Marc Kleine-Budde 2024-06-03 15:24:22 +02:00
parent 56e4515086
commit a876208913
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -195,7 +195,7 @@ populate_ldscript(CPU_FAMILY STM32F407XE
HEAP_SIZE 1k
)
populate_ldscript(CPU_FAMILY STM32G0B1XK
populate_ldscript(CPU_FAMILY STM32G0B1xx
FLASH_START 0x08000000
FLASH_SIZE 512k
RAM_START 0x20000000
@ -248,12 +248,12 @@ function(add_f407_target TGTNAME)
endfunction()
function(add_g0b1_target TGTNAME)
add_target_common(${TGTNAME} STM32G0B1XK)
add_target_common(${TGTNAME} STM32G0B1xx)
target_compile_definitions(${TGTNAME}_fw PRIVATE BOARD_${TGTNAME} STM32G0)
target_compile_options(${TGTNAME}_fw BEFORE PRIVATE ${CPUFLAGS_G0})
target_sources(${TGTNAME}_fw PRIVATE "src/device/device_g0.c")
target_link_options(${TGTNAME}_fw BEFORE PRIVATE ${CPUFLAGS_G0})
target_link_libraries(${TGTNAME}_fw PRIVATE STM32_HAL_STM32G0B1xK STM32_USB_Device_Library_STM32G0B1xK)
target_link_libraries(${TGTNAME}_fw PRIVATE STM32_HAL_STM32G0B1xx STM32_USB_Device_Library_STM32G0B1xx)
endfunction()
########## generate list of targets.

8
libs/STM32_HAL/CMakeLists.txt
View File

@ -193,7 +193,7 @@ add_library(STM32_HAL_STM32F407xE STATIC ${STM32F4_SOURCES})
target_compile_options(STM32_HAL_STM32F407xE PRIVATE ${CPUFLAGS_F4} -Wno-unused-parameter)
target_compile_definitions(STM32_HAL_STM32F407xE PUBLIC STM32F407xx HAL_TARGET_PREFIX=stm32f4xx)
add_library(STM32_HAL_STM32G0B1xK STATIC ${STM32G0_SOURCES})
target_include_directories(STM32_HAL_STM32G0B1xK PUBLIC ${INCLUDE_DIRS} include/stm32g0xx)
target_compile_options(STM32_HAL_STM32G0B1xK PRIVATE ${CPUFLAGS_G0} -Wno-unused-parameter)
target_compile_definitions(STM32_HAL_STM32G0B1xK PUBLIC STM32G0B1xx HAL_TARGET_PREFIX=stm32g0xx)
add_library(STM32_HAL_STM32G0B1xx STATIC ${STM32G0_SOURCES})
target_include_directories(STM32_HAL_STM32G0B1xx PUBLIC ${INCLUDE_DIRS} include/stm32g0xx)
target_compile_options(STM32_HAL_STM32G0B1xx PRIVATE ${CPUFLAGS_G0} -Wno-unused-parameter)
target_compile_definitions(STM32_HAL_STM32G0B1xx PUBLIC STM32G0B1xx HAL_TARGET_PREFIX=stm32g0xx)

8
libs/STM32_USB_Device_Library/CMakeLists.txt
View File

@ -30,7 +30,7 @@ add_library(STM32_USB_Device_Library_STM32F407xE STATIC ${SOURCES})
target_compile_options(STM32_USB_Device_Library_STM32F407xE PRIVATE ${CPUFLAGS_F4} -Wno-unused-parameter -DSTM32F4)
target_link_libraries(STM32_USB_Device_Library_STM32F407xE PRIVATE STM32_HAL_STM32F407xE)
add_library(STM32_USB_Device_Library_STM32G0B1xK STATIC ${SOURCES})
target_include_directories(STM32_USB_Device_Library_STM32G0B1xK PUBLIC ${INCLUDE_DIRS})
target_compile_options(STM32_USB_Device_Library_STM32G0B1xK PRIVATE ${CPUFLAGS_G0} -Wno-unused-parameter -DSTM32G0)
target_link_libraries(STM32_USB_Device_Library_STM32G0B1xK PRIVATE STM32_HAL_STM32G0B1xK)
add_library(STM32_USB_Device_Library_STM32G0B1xx STATIC ${SOURCES})
target_include_directories(STM32_USB_Device_Library_STM32G0B1xx PUBLIC ${INCLUDE_DIRS})
target_compile_options(STM32_USB_Device_Library_STM32G0B1xx PRIVATE ${CPUFLAGS_G0} -Wno-unused-parameter -DSTM32G0)
target_link_libraries(STM32_USB_Device_Library_STM32G0B1xx PRIVATE STM32_HAL_STM32G0B1xx)