|
@@ -10,7 +10,7 @@ SET(STM32_CHIP_TYPES 205xB 205xC 205xE 205xF 205xG 215xE 215xG 207xC 207xE 207xF
|
|
|
SET(STM32_CODES "205.B" "205.C" "205.E" "205.F" "205.G" "215.E" "215.G" "207.C" "207.E" "207.F" "207.G" "217.E" "217.G")
|
|
SET(STM32_CODES "205.B" "205.C" "205.E" "205.F" "205.G" "215.E" "215.G" "207.C" "207.E" "207.F" "207.G" "217.E" "217.G")
|
|
|
|
|
|
|
|
MACRO(STM32_GET_CHIP_TYPE CHIP CHIP_TYPE)
|
|
MACRO(STM32_GET_CHIP_TYPE CHIP CHIP_TYPE)
|
|
|
- STRING(REGEX REPLACE "^[sS][tT][mM]32[fF](2[01]7.[BCDEFG]).+$" "\\1" STM32_CODE ${CHIP})
|
|
|
|
|
|
|
+ STRING(REGEX REPLACE "^[sS][tT][mM]32[fF](2[01][57].[BCDEFG]).*$" "\\1" STM32_CODE ${CHIP})
|
|
|
SET(INDEX 0)
|
|
SET(INDEX 0)
|
|
|
FOREACH(C_TYPE ${STM32_CHIP_TYPES})
|
|
FOREACH(C_TYPE ${STM32_CHIP_TYPES})
|
|
|
LIST(GET STM32_CODES ${INDEX} CHIP_TYPE_REGEXP)
|
|
LIST(GET STM32_CODES ${INDEX} CHIP_TYPE_REGEXP)
|
|
@@ -23,7 +23,7 @@ MACRO(STM32_GET_CHIP_TYPE CHIP CHIP_TYPE)
|
|
|
ENDMACRO()
|
|
ENDMACRO()
|
|
|
|
|
|
|
|
MACRO(STM32_GET_CHIP_PARAMETERS CHIP FLASH_SIZE RAM_SIZE)
|
|
MACRO(STM32_GET_CHIP_PARAMETERS CHIP FLASH_SIZE RAM_SIZE)
|
|
|
- STRING(REGEX REPLACE "^[sS][tT][mM]32[fF]2[01]7.([BCDEFG])" "\\1" STM32_SIZE_CODE ${CHIP})
|
|
|
|
|
|
|
+ STRING(REGEX REPLACE "^[sS][tT][mM]32[fF]2[01][57].([BCDEFG]).*$" "\\1" STM32_SIZE_CODE ${CHIP})
|
|
|
|
|
|
|
|
IF(STM32_SIZE_CODE STREQUAL "B")
|
|
IF(STM32_SIZE_CODE STREQUAL "B")
|
|
|
SET(FLASH "128K")
|
|
SET(FLASH "128K")
|
|
@@ -59,7 +59,7 @@ FUNCTION(STM32_SET_CHIP_DEFINITIONS TARGET CHIP_TYPE)
|
|
|
MESSAGE(FATAL_ERROR "Invalid/unsupported STM32F2 chip type: ${CHIP_TYPE}")
|
|
MESSAGE(FATAL_ERROR "Invalid/unsupported STM32F2 chip type: ${CHIP_TYPE}")
|
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
|
|
|
|
- STRING(REGEX REPLACE "^(2[01]7).[BCDEFG]" "\\1" DEVICE_NUM ${STM32_CHIP_TYPE})
|
|
|
|
|
|
|
+ STRING(REGEX REPLACE "^(2[01][57]).[BCDEFG]" "\\1" DEVICE_NUM ${STM32_CHIP_TYPE})
|
|
|
|
|
|
|
|
GET_TARGET_PROPERTY(TARGET_DEFS ${TARGET} COMPILE_DEFINITIONS)
|
|
GET_TARGET_PROPERTY(TARGET_DEFS ${TARGET} COMPILE_DEFINITIONS)
|
|
|
IF(TARGET_DEFS)
|
|
IF(TARGET_DEFS)
|
|
@@ -68,4 +68,4 @@ FUNCTION(STM32_SET_CHIP_DEFINITIONS TARGET CHIP_TYPE)
|
|
|
SET(TARGET_DEFS "STM32F2;STM32F${DEVICE_NUM}xx")
|
|
SET(TARGET_DEFS "STM32F2;STM32F${DEVICE_NUM}xx")
|
|
|
ENDIF()
|
|
ENDIF()
|
|
|
SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_DEFINITIONS "${TARGET_DEFS}")
|
|
SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_DEFINITIONS "${TARGET_DEFS}")
|
|
|
-ENDFUNCTION()
|
|
|
|
|
|
|
+ENDFUNCTION()
|