Просмотр исходного кода

Fix for #73.

Lines ~162-171 of FindSTM32HAL.cmake try to search for the "hal" identifiers
fmc, fsmc, sdmmc and usb which are "ll" identifiers, at least in my 1.21
STM32F4 FW. Tested with the template project, configuring for a
STM32F429ZIT chip.
Alex Hoffman 6 лет назад
Родитель
Сommit
b9dd884dd5
2 измененных файлов с 4 добавлено и 5 удалено
  1. 1 2
      cmake/FindSTM32HAL.cmake
  2. 3 3
      stm32-template/CMakeLists.txt

+ 1 - 2
cmake/FindSTM32HAL.cmake

@@ -51,8 +51,7 @@ ELSEIF(STM32_FAMILY STREQUAL "F4")
     SET(HAL_COMPONENTS adc can cec cortex crc cryp dac dcmi dma dma2d eth flash
     SET(HAL_COMPONENTS adc can cec cortex crc cryp dac dcmi dma dma2d eth flash
                        flash_ramfunc fmpi2c gpio hash hcd i2c i2s irda iwdg ltdc
                        flash_ramfunc fmpi2c gpio hash hcd i2c i2s irda iwdg ltdc
                        nand nor pccard pcd pwr qspi rcc rng rtc sai sd sdram
                        nand nor pccard pcd pwr qspi rcc rng rtc sai sd sdram
-                       smartcard spdifrx spi sram tim uart usart wwdg fmc fsmc
-                       sdmmc usb)
+                       smartcard spdifrx spi sram tim uart usart wwdg)
 
 
     SET(HAL_REQUIRED_COMPONENTS cortex pwr rcc)
     SET(HAL_REQUIRED_COMPONENTS cortex pwr rcc)
 
 

+ 3 - 3
stm32-template/CMakeLists.txt

@@ -4,12 +4,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 ENABLE_LANGUAGE(ASM)
 ENABLE_LANGUAGE(ASM)
 
 
 FIND_PACKAGE(CMSIS REQUIRED)
 FIND_PACKAGE(CMSIS REQUIRED)
-#FIND_PACKAGE(STM32HAL REQUIRED)
+FIND_PACKAGE(STM32HAL REQUIRED)
 
 
 INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMSIS_INCLUDE_DIRS}
     ${CMSIS_INCLUDE_DIRS}
-    #${STM32HAL_INCLUDE_DIR}
+    ${STM32HAL_INCLUDE_DIR}
 )
 )
 
 
 SET(PROJECT_SOURCES
 SET(PROJECT_SOURCES
@@ -18,7 +18,7 @@ SET(PROJECT_SOURCES
 
 
 SET(STM32_LINKER_SCRIPT ${CMSIS_LINKER_SCRIPT})
 SET(STM32_LINKER_SCRIPT ${CMSIS_LINKER_SCRIPT})
 
 
-ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} ${PROJECT_SOURCES} ${CMSIS_SOURCES}) # ${STM32HAL_SOURCES}
+ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} ${PROJECT_SOURCES} ${CMSIS_SOURCES} ${STM32HAL_SOURCES})
 
 
 STM32_SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME})
 STM32_SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME})
 STM32_ADD_HEX_BIN_TARGETS(${CMAKE_PROJECT_NAME})
 STM32_ADD_HEX_BIN_TARGETS(${CMAKE_PROJECT_NAME})