Correct device type names.

cmake/FindCMSIS.cmake

@@ -55,7 +55,7 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS})
         NAMES ARM.CMSIS.pdsc
         PATHS "${STM32_CUBE_${FAMILY}_PATH}/Drivers/CMSIS"
         NO_DEFAULT_PATH
-    )  
+    )
     
     if (NOT CMSIS_${FAMILY}_PATH)
         continue()
@@ -112,7 +112,7 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS})
         string(TOLOWER ${TYPE} TYPE_L)
         
         find_file(CMSIS_${FAMILY}_${TYPE}_STARTUP
-            NAMES startup_stm32f${TYPE_L}.s
+            NAMES startup_stm32${TYPE_L}.s
             PATHS "${CMSIS_${FAMILY}_PATH}/Device/ST/STM32${FAMILY}xx/Source/Templates/gcc"
             NO_DEFAULT_PATH
         )
@@ -122,14 +122,14 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS})
             break()
         endif()
         
-        if(NOT (TARGET CMSIS::STM32::${FAMILY}::${TYPE}))
-            add_library(CMSIS::STM32::${FAMILY}::${TYPE} INTERFACE IMPORTED)
-            target_link_libraries(CMSIS::STM32::${FAMILY}::${TYPE} INTERFACE CMSIS::STM32::${FAMILY} STM32::${FAMILY}::${TYPE})
-            target_sources(CMSIS::STM32::${FAMILY}::${TYPE} INTERFACE "${CMSIS_${FAMILY}_${TYPE}_STARTUP}")
+        if(NOT (TARGET CMSIS::STM32::${TYPE}))
+            add_library(CMSIS::STM32::${TYPE} INTERFACE IMPORTED)
+            target_link_libraries(CMSIS::STM32::${TYPE} INTERFACE CMSIS::STM32::${FAMILY} STM32::${TYPE})
+            target_sources(CMSIS::STM32::${TYPE} INTERFACE "${CMSIS_${FAMILY}_${TYPE}_STARTUP}")
         endif()
         
         add_library(CMSIS::STM32::${DEVICE} INTERFACE IMPORTED)
-        target_link_libraries(CMSIS::STM32::${DEVICE} INTERFACE CMSIS::STM32::${FAMILY}::${TYPE})
+        target_link_libraries(CMSIS::STM32::${DEVICE} INTERFACE CMSIS::STM32::${TYPE})
         cmsis_generate_default_linker_script(${FAMILY} ${DEVICE})
     endforeach()
         

cmake/stm32/f0.cmake

@@ -1,6 +1,6 @@
 set(STM32_F0_TYPES 
-    030x6 030x8 031x6 038xx 042x6 048xx 051x8 058xx 
-    070x6 070xB 071xB 072xB 078xx 091xC 098xx 030xC
+    F030x6 F030x8 F031x6 F038xx F042x6 F048xx F051x8 F058xx 
+    F070x6 F070xB F071xB F072xB F078xx F091xC F098xx F030xC
 )
 set(STM32_F0_TYPE_MATCH 
     "F030.[46]" "F030.8" "F031.[46]" "F038.." "F042.[46]" "F048.." "F051.[468]" "F058.."

cmake/stm32/f1.cmake

@@ -1,6 +1,6 @@
 set(STM32_F1_TYPES 
-    100xB 100xE 101x6 101xB 101xE 101xG 102x6 102xB 
-    103x6 103xB 103xE 103xG 105xC 107xC
+    F100xB F100xE F101x6 F101xB F101xE F101xG F102x6 F102xB 
+    F103x6 F103xB F103xE F103xG F105xC F107xC
 )
 set(STM32_F1_TYPE_MATCH 
     "F100.[468B]" "F100.[CDE]" "F101.[46]" "F101.[8B]" "F101.[CDE]" "F101.[FG]" "F102.[46]" "F102.[8B]" 
@@ -27,7 +27,7 @@ target_link_options(STM32::F1 INTERFACE
 function(stm32f1_get_memory_info DEVICE TYPE FLASH_SIZE RAM_SIZE)
     string(REGEX REPLACE "F1[0-9][0-9].([468BCDEFGHI])" "\\1" SIZE_CODE ${DEVICE})
     
-    if((TYPE STREQUAL "100xB") OR (TYPE STREQUAL "100xE"))
+    if((TYPE STREQUAL "F100xB") OR (TYPE STREQUAL "F100xE"))
         if((SIZE_CODE STREQUAL "4") OR (SIZE_CODE STREQUAL "6"))
             set(RAM "4K")
         elseif((SIZE_CODE STREQUAL "8") OR (SIZE_CODE STREQUAL "B"))
@@ -37,9 +37,9 @@ function(stm32f1_get_memory_info DEVICE TYPE FLASH_SIZE RAM_SIZE)
         elseif((SIZE_CODE STREQUAL "D") OR (SIZE_CODE STREQUAL "E"))
             set(RAM "32K")
         endif()
-    elseif((TYPE STREQUAL "101x6") OR (TYPE STREQUAL "101xB") OR 
-           (TYPE STREQUAL "101xE") OR (TYPE STREQUAL "101xG") OR
-           (TYPE STREQUAL "102x6") OR (TYPE STREQUAL "102xB"))
+    elseif((TYPE STREQUAL "F101x6") OR (TYPE STREQUAL "F101xB") OR 
+           (TYPE STREQUAL "F101xE") OR (TYPE STREQUAL "F101xG") OR
+           (TYPE STREQUAL "F102x6") OR (TYPE STREQUAL "F102xB"))
         if(SIZE_CODE STREQUAL "4")
             set(RAM "4K")
         elseif(SIZE_CODE STREQUAL "6")
@@ -55,8 +55,8 @@ function(stm32f1_get_memory_info DEVICE TYPE FLASH_SIZE RAM_SIZE)
         elseif((SIZE_CODE STREQUAL "F") OR (SIZE_CODE STREQUAL "G"))
             set(RAM "80K")
         endif()
-    elseif((TYPE STREQUAL "103x6") OR (TYPE STREQUAL "103xB") OR
-           (TYPE STREQUAL "103xE") OR (TYPE STREQUAL "103xG"))
+    elseif((TYPE STREQUAL "F103x6") OR (TYPE STREQUAL "F103xB") OR
+           (TYPE STREQUAL "F103xE") OR (TYPE STREQUAL "F103xG"))
         if(SIZE_CODE STREQUAL "4")
             set(RAM "6K")
         elseif(SIZE_CODE STREQUAL "6")
@@ -70,7 +70,7 @@ function(stm32f1_get_memory_info DEVICE TYPE FLASH_SIZE RAM_SIZE)
         elseif((SIZE_CODE STREQUAL "F") OR (SIZE_CODE STREQUAL "G"))
             set(RAM "96K")
         endif()
-    elseif((TYPE STREQUAL "105xC") OR (TYPE STREQUAL "107xC"))
+    elseif((TYPE STREQUAL "F105xC") OR (TYPE STREQUAL "F107xC"))
         set(RAM "64K")
     endif()
     

cmake/stm32/f4.cmake

@@ -1,7 +1,7 @@
 set(STM32_F4_TYPES 
-    401xC 401xE 405xx 407xx 410Cx 410Rx 410Tx 411xE 
-    412Cx 412Rx 412Vx 412Zx 413xx 415xx 417xx 423xx
-    427xx 429xx 437xx 439xx 446xx 469xx 479xx
+    F401xC F401xE F405xx F407xx F410Cx F410Rx F410Tx F411xE 
+    F412Cx F412Rx F412Vx F412Zx F413xx F415xx F417xx F423xx
+    F427xx F429xx F437xx F439xx F446xx F469xx F479xx
 )
 set(STM32_F4_TYPE_MATCH 
     "F401.[CB]" "F401.[ED]" "F405.." "F407.." "F410C." "F410R." "F410T." "F411.[CE]"

cmake/stm32/utilities.cmake

@@ -18,11 +18,11 @@ function(stm32_util_create_family_targets FAMILY)
         )
     endif()
     foreach(TYPE ${STM32_${FAMILY}_TYPES})
-        if(NOT (TARGET STM32::${FAMILY}::${TYPE}))
-            add_library(STM32::${FAMILY}::${TYPE} INTERFACE IMPORTED)
-            target_link_libraries(STM32::${FAMILY}::${TYPE} INTERFACE STM32::${FAMILY})
-            target_compile_definitions(STM32::${FAMILY}::${TYPE} INTERFACE 
-                STM32F${TYPE}
+        if(NOT (TARGET STM32::${TYPE}))
+            add_library(STM32::${TYPE} INTERFACE IMPORTED)
+            target_link_libraries(STM32::${TYPE} INTERFACE STM32::${FAMILY})
+            target_compile_definitions(STM32::${TYPE} INTERFACE 
+                STM32${TYPE}
             )
         endif()
     endforeach()

examples/custom-linker-script/CMakeLists.txt

@@ -10,5 +10,5 @@ set(PROJECT_SOURCES
 )
 
 add_executable(stm32-custom-linker-script.elf ${PROJECT_SOURCES})
-target_link_libraries(stm32-custom-linker-script.elf CMSIS::STM32::F4::407xx STM32::NoSys)
+target_link_libraries(stm32-custom-linker-script.elf CMSIS::STM32::F407xx STM32::NoSys)
 stm32_add_linker_script(stm32-custom-linker-script.elf PRIVATE F407VG.ld)

tests/cmsis/CMakeLists.txt

@@ -16,6 +16,12 @@ include(stm32/devices)
 foreach(FAMILY ${TEST_FAMILIES})
     stm32_get_devices_by_family(${FAMILY} DEVICES)
     foreach(DEVICE ${DEVICES})    
+        stm32_get_chip_type(${FAMILY} ${DEVICE} TYPE)
+        stm32_get_memory_info(${FAMILY} ${DEVICE} 
+            FLASH_SIZE RAM_SIZE CCRAM_SIZE STACK_SIZE HEAP_SIZE 
+            FLASH_ORIGIN RAM_ORIGIN CCRAM_ORIGIN
+        )
+        message(STATUS "STM32${DEVICE}: ${FAMILY} family, type ${TYPE}, ${FLASH_SIZE} flash, ${RAM_SIZE} RAM")
         add_executable(cmsis-test-${DEVICE} ${SOURCES})
         target_link_libraries(cmsis-test-${DEVICE} CMSIS::STM32::${DEVICE} STM32::NoSys)
     endforeach()