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

Remove LL support when finding HAL package

New Find... file will be created to LL to treat it as a separated
library.
Kacper 8 лет назад
Родитель
Сommit
7350d3fea7
1 измененных файлов с 1 добавлено и 29 удалено
  1. 1 29
      cmake/FindSTM32HAL.cmake

+ 1 - 29
cmake/FindSTM32HAL.cmake

@@ -8,9 +8,6 @@ IF(STM32_FAMILY STREQUAL "F0")
     # Components that have _ex sources
     # Components that have _ex sources
     SET(HAL_EX_COMPONENTS adc crc dac flash i2c pcd pwr rcc rtc smartcard spi tim uart)
     SET(HAL_EX_COMPONENTS adc crc dac flash i2c pcd pwr rcc rtc smartcard spi tim uart)
 
 
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS "")
-
     SET(HAL_PREFIX stm32f0xx_)
     SET(HAL_PREFIX stm32f0xx_)
 
 
 ELSEIF(STM32_FAMILY STREQUAL "F1")
 ELSEIF(STM32_FAMILY STREQUAL "F1")
@@ -23,9 +20,6 @@ ELSEIF(STM32_FAMILY STREQUAL "F1")
     # Components that have _ex sources
     # Components that have _ex sources
     SET(HAL_EX_COMPONENTS adc dac flash gpio pcd rcc rtc tim)
     SET(HAL_EX_COMPONENTS adc dac flash gpio pcd rcc rtc tim)
 
 
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS fsmc sdmmc usb)
-
     SET(HAL_PREFIX stm32f1xx_)
     SET(HAL_PREFIX stm32f1xx_)
 
 
 ELSEIF(STM32_FAMILY STREQUAL "F2")
 ELSEIF(STM32_FAMILY STREQUAL "F2")
@@ -39,9 +33,6 @@ ELSEIF(STM32_FAMILY STREQUAL "F2")
     # Components that have _ex sources
     # Components that have _ex sources
     SET(HAL_EX_COMPONENTS adc dac dma flash pwr rcc rtc tim)
     SET(HAL_EX_COMPONENTS adc dac dma flash pwr rcc rtc tim)
 
 
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS fsmc sdmmc usb)
-
     SET(HAL_PREFIX stm32f2xx_)
     SET(HAL_PREFIX stm32f2xx_)
 
 
 ELSEIF(STM32_FAMILY STREQUAL "F3")
 ELSEIF(STM32_FAMILY STREQUAL "F3")
@@ -69,9 +60,6 @@ ELSEIF(STM32_FAMILY STREQUAL "F4")
     SET(HAL_EX_COMPONENTS adc cryp dac dcmi dma flash fmpi2c hash i2c i2s pcd
     SET(HAL_EX_COMPONENTS adc cryp dac dcmi dma flash fmpi2c hash i2c i2s pcd
                           pwr rcc rtc sai tim)
                           pwr rcc rtc sai tim)
 
 
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS fmc fsmc sdmmc usb)
-
     SET(HAL_PREFIX stm32f4xx_)
     SET(HAL_PREFIX stm32f4xx_)
 
 
 ELSEIF(STM32_FAMILY STREQUAL "F7")
 ELSEIF(STM32_FAMILY STREQUAL "F7")
@@ -86,9 +74,6 @@ ELSEIF(STM32_FAMILY STREQUAL "F7")
     SET(HAL_EX_COMPONENTS adc crc cryp dac dcmi dma flash hash i2c pcd
     SET(HAL_EX_COMPONENTS adc crc cryp dac dcmi dma flash hash i2c pcd
                           pwr rcc rtc sai tim)
                           pwr rcc rtc sai tim)
 
 
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS fmc sdmmc usb)
-
     SET(HAL_PREFIX stm32f7xx_)
     SET(HAL_PREFIX stm32f7xx_)
 
 
 ELSEIF(STM32_FAMILY STREQUAL "L0")
 ELSEIF(STM32_FAMILY STREQUAL "L0")
@@ -101,9 +86,6 @@ ELSEIF(STM32_FAMILY STREQUAL "L0")
     # Components that have _ex sources
     # Components that have _ex sources
     SET(HAL_EX_COMPONENTS adc comp crc cryp dac flash i2c pcd pwr rcc rtc smartcard tim uart usart)
     SET(HAL_EX_COMPONENTS adc comp crc cryp dac flash i2c pcd pwr rcc rtc smartcard tim uart usart)
 
 
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS crs exti lpuart utils)
-
     SET(HAL_PREFIX stm32l0xx_)
     SET(HAL_PREFIX stm32l0xx_)
 
 
 ELSEIF(STM32_FAMILY STREQUAL "L4")
 ELSEIF(STM32_FAMILY STREQUAL "L4")
@@ -118,11 +100,6 @@ ELSEIF(STM32_FAMILY STREQUAL "L4")
     SET(HAL_EX_COMPONENTS adc crc cryp dac dfsdm dma flash hash i2c ltdc 
     SET(HAL_EX_COMPONENTS adc crc cryp dac dfsdm dma flash hash i2c ltdc 
                           opamp pcd pwr rcc rtc sai sd smartcard spi tim uart usart)
                           opamp pcd pwr rcc rtc sai sd smartcard spi tim uart usart)
                           
                           
-
-    # Components that have ll_ in names instead of hal_
-    SET(HAL_LL_COMPONENTS adc comp crc crs dac dma dma2d exti fmc gpio i2c lptim lpuart
-                          opamp pwr rcc rng rtc sdmmc spi swpmi tim usart usb utils)
-
     SET(HAL_PREFIX stm32l4xx_)
     SET(HAL_PREFIX stm32l4xx_)
 
 
 ENDIF()
 ENDIF()
@@ -151,14 +128,9 @@ FOREACH(cmp ${STM32HAL_FIND_COMPONENTS})
     LIST(FIND HAL_COMPONENTS ${cmp} STM32HAL_FOUND_INDEX)
     LIST(FIND HAL_COMPONENTS ${cmp} STM32HAL_FOUND_INDEX)
     IF(${STM32HAL_FOUND_INDEX} LESS 0)
     IF(${STM32HAL_FOUND_INDEX} LESS 0)
         MESSAGE(FATAL_ERROR "Unknown STM32HAL component: ${cmp}. Available components: ${HAL_COMPONENTS}")
         MESSAGE(FATAL_ERROR "Unknown STM32HAL component: ${cmp}. Available components: ${HAL_COMPONENTS}")
-    ENDIF()
-    LIST(FIND HAL_LL_COMPONENTS ${cmp} STM32HAL_FOUND_INDEX)
-    IF(${STM32HAL_FOUND_INDEX} LESS 0)
+	ELSE()
         LIST(APPEND HAL_HEADERS ${HAL_PREFIX}hal_${cmp}.h)
         LIST(APPEND HAL_HEADERS ${HAL_PREFIX}hal_${cmp}.h)
         LIST(APPEND HAL_SRCS ${HAL_PREFIX}hal_${cmp}.c)
         LIST(APPEND HAL_SRCS ${HAL_PREFIX}hal_${cmp}.c)
-    ELSE()
-        LIST(APPEND HAL_HEADERS ${HAL_PREFIX}ll_${cmp}.h)
-        LIST(APPEND HAL_SRCS ${HAL_PREFIX}ll_${cmp}.c)
     ENDIF()
     ENDIF()
     LIST(FIND HAL_EX_COMPONENTS ${cmp} STM32HAL_FOUND_INDEX)
     LIST(FIND HAL_EX_COMPONENTS ${cmp} STM32HAL_FOUND_INDEX)
     IF(NOT (${STM32HAL_FOUND_INDEX} LESS 0))
     IF(NOT (${STM32HAL_FOUND_INDEX} LESS 0))