Explorar o código

More F0 fixes.

Konstantin Oblaukhov %!s(int64=10) %!d(string=hai) anos
pai
achega
e45f4323d4
Modificáronse 1 ficheiros con 24 adicións e 28 borrados
  1. 24 28
      cmake/gcc_stm32f0.cmake

+ 24 - 28
cmake/gcc_stm32f0.cmake

@@ -40,42 +40,38 @@ MACRO(STM32_GET_CHIP_PARAMETERS CHIP FLASH_SIZE RAM_SIZE)
 
     STM32_GET_CHIP_TYPE(${CHIP} TYPE)
 
-    IF(${TYPE} STREQUAL 030xC)
-        IF((STM32_SIZE_CODE STREQUAL "4") OR (STM32_SIZE_CODE STREQUAL "6"))
-            SET(RAM "4K")
-	ELSEIF(STM32_SIZE_CODE STREQUAL "8")
-	    SET(RAM "8K")
-        ELSE()
-            SET(RAM "32K")
-        ENDIF()
+    IF(${TYPE} STREQUAL 030x6)
+        SET(RAM "4K")
+    ELSEIF(${TYPE} STREQUAL 030x8)
+        SET(RAM "8K")
+    ELSEIF(${TYPE} STREQUAL 030xC)
+        SET(RAM "32K")
     ELSEIF(${TYPE} STREQUAL 031x6)
-            SET(RAM "4K")
-    ELSEIF(${TYPE} STREQUAL 038x6)
-            SET(RAM "4K")
+        SET(RAM "4K")
+    ELSEIF(${TYPE} STREQUAL 038xx)
+        SET(RAM "4K")
     ELSEIF(${TYPE} STREQUAL 042x6)
-            SET(RAM "6K")
+        SET(RAM "6K")
     ELSEIF(${TYPE} STREQUAL 048x6)
-            SET(RAM "6K")
+        SET(RAM "6K")
     ELSEIF(${TYPE} STREQUAL 051x8)
-            SET(RAM "8K")
-    ELSEIF(${TYPE} STREQUAL 058x8)
-            SET(RAM "8K")
+        SET(RAM "8K")
+    ELSEIF(${TYPE} STREQUAL 058xx)
+        SET(RAM "8K")
+    ELSEIF(${TYPE} STREQUAL 070x6)
+        SET(RAM "6K")
     ELSEIF(${TYPE} STREQUAL 070xB)
-        IF(STM32_SIZE_CODE STREQUAL "6")
-            SET(RAM "6K")
-        ELSE()
-            SET(RAM "16K")
-        ENDIF()
+        SET(RAM "16K")
     ELSEIF(${TYPE} STREQUAL 071xB)
-            SET(RAM "16K")
+        SET(RAM "16K")
     ELSEIF(${TYPE} STREQUAL 072xB)
-            SET(RAM "16K")
-    ELSEIF(${TYPE} STREQUAL 078xB)
-            SET(RAM "16K")
+        SET(RAM "16K")
+    ELSEIF(${TYPE} STREQUAL 078xx)
+        SET(RAM "16K")
     ELSEIF(${TYPE} STREQUAL 091xC)
-            SET(RAM "32K")
-    ELSEIF(${TYPE} STREQUAL 098xC)
-            SET(RAM "32K")
+        SET(RAM "32K")
+    ELSEIF(${TYPE} STREQUAL 098xx)
+        SET(RAM "32K")
     ENDIF()
 
     SET(${FLASH_SIZE} ${FLASH})