Inicio Explorar Axuda
Iniciar sesión
torambo.com
/
Momentum-Apps
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge pull request #81 from pymaximus/master

add fmc as LL component in F4 family
Konstantin Oblaukhov %!s(int64=7) %!d(string=hai) anos
pai
7aa40cfc5a 19f4d671e9
achega
5e238432e8
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 1
      cmake/FindSTM32LL.cmake
  2. 2 2
      cmake/gcc_stm32f4.cmake

+ 1 - 1
cmake/FindSTM32LL.cmake
Ver ficheiro 

@@ -33,7 +33,7 @@ ELSEIF(STM32_FAMILY STREQUAL "F3")
 
     SET(LL_PREFIX stm32f3xx_)
 
     SET(LL_PREFIX stm32f3xx_)
 
 
 
 ELSEIF(STM32_FAMILY STREQUAL "F4")
 
 ELSEIF(STM32_FAMILY STREQUAL "F4")
 
-    SET(LL_COMPONENTS	adc bus cortex crc dac dma2d dma exti gpio i2c i2s iwdg
 
+    SET(LL_COMPONENTS	adc bus cortex crc dac dma2d dma exti fmc gpio i2c i2s iwdg
 
 						lptim pwr rcc rng rtc spi system tim usart usb utils wwdg)
 
 						lptim pwr rcc rng rtc spi system tim usart usb utils wwdg)
 
 
 
     SET(LL_REQUIRED_COMPONENTS bus cortex pwr rcc system utils)
 
     SET(LL_REQUIRED_COMPONENTS bus cortex pwr rcc system utils)

+ 2 - 2
cmake/gcc_stm32f4.cmake
Ver ficheiro 

@@ -1,5 +1,5 @@
 
-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_C_FLAGS "-mthumb -fno-builtin -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wall -std=gnu11 -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++14 -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_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_EXE_LINKER_FLAGS "-Wl,--gc-sections -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mabi=aapcs" CACHE INTERNAL "executable linker flags")