Konstantin Oblaukhov 5 лет назад
Родитель
Сommit
25976449b2
4 измененных файлов с 25 добавлено и 3 удалено
  1. 1 1
      cmake/FindCMSIS.cmake
  2. 2 1
      cmake/stm32/common.cmake
  3. 21 0
      cmake/stm32/g4.cmake
  4. 1 1
      tests/cmsis/CMakeLists.txt

+ 1 - 1
cmake/FindCMSIS.cmake

@@ -1,5 +1,5 @@
 if(NOT CMSIS_FIND_COMPONENTS)
 if(NOT CMSIS_FIND_COMPONENTS)
-    set(CMSIS_FIND_COMPONENTS STM32F0 STM32G0 STM32L0 STM32F1 STM32L1 STM32F2 STM32F3 STM32F4)
+    set(CMSIS_FIND_COMPONENTS STM32F0 STM32G0 STM32L0 STM32F1 STM32L1 STM32F2 STM32F3 STM32F4 STM32G4)
 endif()
 endif()
 
 
 include(stm32/devices)
 include(stm32/devices)

+ 2 - 1
cmake/stm32/common.cmake

@@ -1,4 +1,4 @@
-set(STM32_SUPPORTED_FAMILIES L0 L1 L4 F0 F1 F2 F3 F4 F7 H7)
+set(STM32_SUPPORTED_FAMILIES L0 L1 L4 F0 F1 F2 F3 F4 G4 F7 H7)
 
 
 if(NOT STM32_TOOLCHAIN_PATH)
 if(NOT STM32_TOOLCHAIN_PATH)
      set(STM32_TOOLCHAIN_PATH "/usr")
      set(STM32_TOOLCHAIN_PATH "/usr")
@@ -153,4 +153,5 @@ include(stm32/l1)
 include(stm32/f2)
 include(stm32/f2)
 include(stm32/f3)
 include(stm32/f3)
 include(stm32/f4)
 include(stm32/f4)
+include(stm32/g4)
 
 

+ 21 - 0
cmake/stm32/g4.cmake

@@ -0,0 +1,21 @@
+set(STM32_G4_TYPES 
+    G431xx G441xx G471xx G473xx G483xx G474xx G484xx
+)
+set(STM32_G4_TYPE_MATCH 
+    "G431.." "G441.." "G471.." "G473.." "G483.." "G474.." "G484.."
+)
+set(STM32_G4_RAM_SIZES 
+     22K  22K  96K  96K  96K  96K  96K
+)
+set(STM32_G4_CCRAM_SIZES 
+     10K  10K  32K  32K  32K  32K  32K
+)
+
+stm32_util_create_family_targets(G4)
+
+target_compile_options(STM32::G4 INTERFACE 
+    -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+)
+target_link_options(STM32::G4 INTERFACE 
+    -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+)

+ 1 - 1
tests/cmsis/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 
 
 if(NOT TEST_FAMILIES)
 if(NOT TEST_FAMILIES)
-    set(TEST_FAMILIES F0 G0 L0 F1 L1 F2 F3 F4)
+    set(TEST_FAMILIES F0 G0 L0 F1 L1 F2 F3 F4 G4)
 endif()
 endif()
 
 
 project(cmsis-test C ASM)
 project(cmsis-test C ASM)