Fixed MP1 device types

cmake/FindCMSIS.cmake

@@ -236,16 +236,9 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS_FAMILIES})
         string(TOLOWER ${DEVICE} DEVICE_L)
         string(TOLOWER ${TYPE} TYPE_L)
 
-        set(STARTUP_NAMES startup_stm32${TYPE_L}.s startup_stm32${TYPE_L}${CORE_Ucm}.s)
-        if(${FAMILY} STREQUAL "MP1")
-            # stm32mp15?dxx.s uses stm32mp15?axx.s
-            # stm32mp15?fxx.s uses stm32mp15?cxx.s
-            string(REPLACE "dxx" "axx" STARTUP_NAMES ${STARTUP_NAMES})
-            string(REPLACE "fxx" "cxx" STARTUP_NAMES ${STARTUP_NAMES})
-        endif()
-        
         find_file(CMSIS_${FAMILY}${CORE_U}_${TYPE}_STARTUP
-            NAMES ${STARTUP_NAMES}
+            NAMES startup_stm32${TYPE_L}.s 
+                  startup_stm32${TYPE_L}${CORE_Ucm}.s
             PATHS "${CMSIS_${FAMILY}${CORE_U}_PATH}/Source/Templates/gcc"
             NO_DEFAULT_PATH
         )

cmake/stm32/mp1.cmake

@@ -1,22 +1,22 @@
 set(STM32_MP1_TYPES 
-    MP151Axx MP151Cxx MP151Dxx MP151Fxx
-    MP153Axx MP153Cxx MP153Dxx MP153Fxx 
-    MP157Axx MP157Cxx MP157Dxx MP157Fxx)
+    MP151Axx MP151Cxx
+    MP153Axx MP153Cxx 
+    MP157Axx MP157Cxx)
 
 set(STM32_MP1_TYPE_MATCH
-    "MP151AA.?" "MP151CA.?" "MP151DA.?" "MP151FA.?"  
-    "MP153AA.?" "MP153CA.?" "MP153DA.?" "MP153FA.?"
-    "MP157AA.?" "MP157CA.?" "MP157DA.?" "MP157FA.?")
+    "MP151[AD]A.?" "MP151[CF]A.?"  
+    "MP153[AD]A.?" "MP153[CF]A.?"
+    "MP157[AD]A.?" "MP157[CF]A.?")
 
 set(STM32_MP1_RAM_SIZES
-    384K 384K 384K 384K
-    384K 384K 384K 384K
-    384K 384K 384K 384K)
+    384K 384K
+    384K 384K
+    384K 384K)
 
 set(STM32_MP1_CCRAM_SIZES
-    0K 0K 0K 0K
-    0K 0K 0K 0K
-    0K 0K 0K 0K)
+    0K 0K
+    0K 0K
+    0K 0K)
 
 stm32_util_create_family_targets(MP1 M4)