Browse Source

Merge pull request #62 from Krasutski/add_stm32l4_support

Add STM32L4 support
Konstantin Oblaukhov 8 years ago
parent
commit
53525dbf17
6 changed files with 147 additions and 4 deletions
  1. 1 1
      README.md
  2. 12 0
      cmake/FindCMSIS.cmake
  3. 27 0
      cmake/FindSTM32HAL.cmake
  4. 2 2
      cmake/gcc_stm32.cmake
  5. 1 1
      cmake/gcc_stm32f7.cmake
  6. 104 0
      cmake/gcc_stm32l4.cmake

+ 1 - 1
README.md

@@ -6,7 +6,7 @@ This project is used to develop applications for the STM32 - ST's ARM Cortex-Mx
 
 * cmake >= 3.0
 * GCC toolchain with newlib (optional).
-* STM32CubeMX package for STM32F0, STM32F1, STM32F2, STM32F3, STM32F4, STM32F7, STM32L0, families.
+* STM32CubeMX package for STM32F0, STM32F1, STM32F2, STM32F3, STM32F4, STM32F7, STM32L0, STM32L4 families.
 
 ## Project contains
 

+ 12 - 0
cmake/FindCMSIS.cmake

@@ -91,6 +91,18 @@ ELSEIF(STM32_FAMILY STREQUAL "L0")
     IF(NOT CMSIS_STARTUP_SOURCE)
         SET(CMSIS_STARTUP_SOURCE startup_stm32l${STM32_CHIP_TYPE_LOWER}.s)
     ENDIF()
+ELSEIF(STM32_FAMILY STREQUAL "L4")
+    IF(NOT STM32Cube_DIR)
+        SET(STM32Cube_DIR "/opt/STM32Cube_FW_L4_V1.9.0")
+        MESSAGE(STATUS "No STM32Cube_DIR specified, using default: " ${STM32Cube_DIR})
+    ENDIF()
+
+    LIST(APPEND CMSIS_COMMON_HEADERS core_cm4.h)
+    SET(CMSIS_DEVICE_HEADERS stm32l4xx.h system_stm32l4xx.h)
+    SET(CMSIS_DEVICE_SOURCES system_stm32l4xx.c) 
+    IF(NOT CMSIS_STARTUP_SOURCE)
+        SET(CMSIS_STARTUP_SOURCE startup_stm32l${STM32_CHIP_TYPE_LOWER}.s)
+    ENDIF()   
 ENDIF()
 
 IF(NOT CMSIS_STARTUP_SOURCE)

+ 27 - 0
cmake/FindSTM32HAL.cmake

@@ -159,6 +159,33 @@ ELSEIF(STM32_FAMILY STREQUAL "L0")
     SET(HAL_SRCS
         stm32l0xx_hal.c
     )
+ELSEIF(STM32_FAMILY STREQUAL "L4")
+    SET(HAL_COMPONENTS adc can comp cortex crc cryp dac dcmi dfsdm dma dma2d dsi 
+                       firewall flash flash_ramfunc gfxmmu gpio hash hcd i2c irda iwdg 
+                       lcd lptim ltdc nand nor opamp ospi pcd pwr qspi rcc rng rtc sai
+                       sd smartcard smbus spi sram swpmi tim tsc uart usart wwdg)
+
+    SET(HAL_REQUIRED_COMPONENTS cortex pwr rcc)
+
+    # Components that have _ex sources
+    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)
+                          
+
+    # 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_HEADERS
+        stm32l4xx_hal.h
+        stm32l4xx_hal_def.h
+    )
+
+    SET(HAL_SRCS
+        stm32l4xx_hal.c
+    )    
 ENDIF()
 
 IF(NOT STM32HAL_FIND_COMPONENTS)

+ 2 - 2
cmake/gcc_stm32.cmake

@@ -1,7 +1,7 @@
 GET_FILENAME_COMPONENT(STM32_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
 SET(CMAKE_MODULE_PATH ${STM32_CMAKE_DIR} ${CMAKE_MODULE_PATH})
 
-SET(STM32_SUPPORTED_FAMILIES L0 F0 F1 F2 F3 F4 F7 CACHE INTERNAL "stm32 supported families")
+SET(STM32_SUPPORTED_FAMILIES L0 L4 F0 F1 F2 F3 F4 F7 CACHE INTERNAL "stm32 supported families")
 IF(STM32_CHIP)
 	 SET(STM32_CHIP "${STM32_CHIP}" CACHE STRING "STM32 chip to build for")
 ENDIF()
@@ -24,7 +24,7 @@ IF(NOT STM32_FAMILY)
         SET(STM32_FAMILY "F1" CACHE INTERNAL "stm32 family")
         MESSAGE(STATUS "Neither STM32_FAMILY nor STM32_CHIP specified, using default STM32_FAMILY: ${STM32_FAMILY}")
     ELSE()
-        STRING(REGEX REPLACE "^[sS][tT][mM]32(([fF][0-47])|([lL][0-1])|([tT])|([wW])).+$" "\\1" STM32_FAMILY ${STM32_CHIP})
+        STRING(REGEX REPLACE "^[sS][tT][mM]32(([fF][0-47])|([lL][0-14])|([tT])|([wW])).+$" "\\1" STM32_FAMILY ${STM32_CHIP})
         STRING(TOUPPER ${STM32_FAMILY} STM32_FAMILY)
         MESSAGE(STATUS "Selected STM32 family: ${STM32_FAMILY}")
     ENDIF()

+ 1 - 1
cmake/gcc_stm32f7.cmake

@@ -5,7 +5,7 @@ SET(CMAKE_ASM_FLAGS "-mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=softf
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--gc-sections -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "executable linker flags")
 SET(CMAKE_MODULE_LINKER_FLAGS "-mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "module linker flags")
 SET(CMAKE_SHARED_LINKER_FLAGS "-mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "shared linker flags")
-SET(STM32_CHIP_TYPES 745xx 746xx 756xx 767xx 777xx 769xx 779xx CACHE INTERNAL "stm32f4 chip types")
+SET(STM32_CHIP_TYPES 745xx 746xx 756xx 767xx 777xx 769xx 779xx CACHE INTERNAL "stm32f7 chip types")
 SET(STM32_CODES "745.." "746.." "756.." "767.." "777.." "769.." "779..")
 
 MACRO(STM32_GET_CHIP_TYPE CHIP CHIP_TYPE)

+ 104 - 0
cmake/gcc_stm32l4.cmake

@@ -0,0 +1,104 @@
+SET(CMAKE_C_FLAGS "-mthumb -fno-builtin -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wall -std=gnu99 -ffunction-sections -fdata-sections -fomit-frame-pointer -mabi=aapcs -fno-unroll-loops -ffast-math -ftree-vectorize" CACHE INTERNAL "c compiler flags")
+SET(CMAKE_CXX_FLAGS "-mthumb -fno-builtin -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wall -std=c++11 -ffunction-sections -fdata-sections -fomit-frame-pointer -mabi=aapcs -fno-unroll-loops -ffast-math -ftree-vectorize" CACHE INTERNAL "cxx compiler flags")
+SET(CMAKE_ASM_FLAGS "-mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--gc-sections -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "executable linker flags")
+SET(CMAKE_MODULE_LINKER_FLAGS "-mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "module linker flags")
+SET(CMAKE_SHARED_LINKER_FLAGS "-mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "shared linker flags")
+SET(STM32_CHIP_TYPES 431xx 432xx 433xx 442xx 443xx 451xx 452xx 462xx 471xx 475xx 476xx 485xx 486xx 496xx 4a6xx 4r5xx 4r7xx 4r9xx 4s5xx 4s7xx 4s9xx CACHE INTERNAL "stm32l4 chip types")
+SET(STM32_CODES "431.." "432.." "433.." "442.." "443.." "451.." "452.." "462.." "471.." "475.." "476.." "485.." "486.." "496.." "4a6.." "4r5.." "4r7.." "4r9.." "4s5.." "4s7.." "4s9..")
+
+MACRO(STM32_GET_CHIP_TYPE CHIP CHIP_TYPE)
+    STRING(REGEX REPLACE "^[sS][tT][mM]32[lL](4[3456789ARS][1235679].[BCEGI]).*$" "\\1" STM32_CODE ${CHIP})
+    SET(INDEX 0)
+    FOREACH(C_TYPE ${STM32_CHIP_TYPES})
+        LIST(GET STM32_CODES ${INDEX} CHIP_TYPE_REGEXP)
+        IF(STM32_CODE MATCHES ${CHIP_TYPE_REGEXP})
+            SET(RESULT_TYPE ${C_TYPE})
+        ENDIF()
+        MATH(EXPR INDEX "${INDEX}+1")
+    ENDFOREACH()
+    SET(${CHIP_TYPE} ${RESULT_TYPE})
+ENDMACRO()
+
+MACRO(STM32_GET_CHIP_PARAMETERS CHIP FLASH_SIZE RAM_SIZE CCRAM_SIZE)
+    STRING(REGEX REPLACE "^[sS][tT][mM]32[lL](4[3456789ARS][1235679].[BCEGI]]).*$" "\\1" STM32_CODE ${CHIP})
+    STRING(REGEX REPLACE "^[sS][tT][mM]32[lL]4[3456789ARS][1235679].([BCEGI]).*$" "\\1" STM32_SIZE_CODE ${CHIP})
+    
+    IF(STM32_SIZE_CODE STREQUAL "B")
+        SET(FLASH "128K")
+    ELSEIF(STM32_SIZE_CODE STREQUAL "C")
+        SET(FLASH "256K")
+    ELSEIF(STM32_SIZE_CODE STREQUAL "E")
+        SET(FLASH "512K")
+    ELSEIF(STM32_SIZE_CODE STREQUAL "G")
+        SET(FLASH "1024K")
+    ELSEIF(STM32_SIZE_CODE STREQUAL "I")
+        SET(FLASH "2048K")
+    ENDIF()
+    
+    STM32_GET_CHIP_TYPE(${CHIP} TYPE)
+    
+    IF(${TYPE} STREQUAL "431xx")
+        SET(RAM "64K")
+    ELSEIF(${TYPE} STREQUAL "432xx")
+        SET(RAM "64K")
+    ELSEIF(${TYPE} STREQUAL "433xx")
+        SET(RAM "64K")
+    ELSEIF(${TYPE} STREQUAL "442xx")
+        SET(RAM "64K")
+    ELSEIF(${TYPE} STREQUAL "443xx")
+        SET(RAM "64K")
+    ELSEIF(${TYPE} STREQUAL "451xx")
+        SET(RAM "160K")
+    ELSEIF(${TYPE} STREQUAL "452xx")
+        SET(RAM "160K")
+    ELSEIF(${TYPE} STREQUAL "462xx")
+        SET(RAM "160K")
+    ELSEIF(${TYPE} STREQUAL "471xx")
+        SET(RAM "128K")
+    ELSEIF(${TYPE} STREQUAL "475xx")
+        SET(RAM "128K")
+    ELSEIF(${TYPE} STREQUAL "476xx")
+        SET(RAM "128K")
+    ELSEIF(${TYPE} STREQUAL "485xx")
+        SET(RAM "128K")
+    ELSEIF(${TYPE} STREQUAL "486xx")
+        SET(RAM "128K")
+    ELSEIF(${TYPE} STREQUAL "496xx")
+        SET(RAM "320K")
+    ELSEIF(${TYPE} STREQUAL "4a6xx")
+        SET(RAM "320K")
+    ELSEIF(${TYPE} STREQUAL "4r5xx")
+        SET(RAM "640K")
+    ELSEIF(${TYPE} STREQUAL "4r7xx")
+        SET(RAM "640K")
+    ELSEIF(${TYPE} STREQUAL "4r9xx")
+        SET(RAM "640K")
+    ELSEIF(${TYPE} STREQUAL "4s5xx")
+        SET(RAM "640K")
+    ELSEIF(${TYPE} STREQUAL "4s7xx")
+        SET(RAM "640K")
+    ELSEIF(${TYPE} STREQUAL "4s9xx")
+        SET(RAM "640K")
+    ENDIF()
+    
+    SET(${FLASH_SIZE} ${FLASH})
+    SET(${RAM_SIZE} ${RAM})
+    SET(${CCRAM_SIZE} "64K")
+ENDMACRO()
+
+FUNCTION(STM32_SET_CHIP_DEFINITIONS TARGET CHIP_TYPE)
+    LIST(FIND STM32_CHIP_TYPES ${CHIP_TYPE} TYPE_INDEX)
+    IF(TYPE_INDEX EQUAL -1)
+        MESSAGE(FATAL_ERROR "Invalid/unsupported STM32L4 chip type: ${CHIP_TYPE}")
+    ENDIF()
+    GET_TARGET_PROPERTY(TARGET_DEFS ${TARGET} COMPILE_DEFINITIONS)
+    IF(TARGET_DEFS)
+        SET(TARGET_DEFS "STM32L4;STM32L${CHIP_TYPE};${TARGET_DEFS}")
+    ELSE()
+        SET(TARGET_DEFS "STM32L4;STM32L${CHIP_TYPE}")
+    ENDIF()
+        
+    SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_DEFINITIONS "${TARGET_DEFS}")
+ENDFUNCTION()