Skip to content

Commit 5f5c92c

Browse files
authored
Merge pull request ObKo#345 from ciuzhienki/master
stm32_get_memory_info : FAMILY field is no longer required to get the ram size
2 parents d8f9e07 + b1f62c9 commit 5f5c92c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

cmake/stm32/common.cmake

+8-8
Original file line numberDiff line numberDiff line change
@@ -266,21 +266,21 @@ function(stm32_get_memory_info)
266266
set(RAM_SHARE_ORIGIN 0x20030000)
267267

268268
unset(TWO_FLASH_BANKS)
269-
if(FAMILY STREQUAL "F1")
269+
if(INFO_FAMILY STREQUAL "F1")
270270
stm32f1_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} FLASH RAM)
271-
elseif(FAMILY STREQUAL "L1")
271+
elseif(INFO_FAMILY STREQUAL "L1")
272272
stm32l1_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} FLASH RAM)
273-
elseif(FAMILY STREQUAL "F2")
273+
elseif(INFO_FAMILY STREQUAL "F2")
274274
stm32f2_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} FLASH RAM)
275-
elseif(FAMILY STREQUAL "F3")
275+
elseif(INFO_FAMILY STREQUAL "F3")
276276
stm32f3_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} FLASH RAM)
277-
elseif(FAMILY STREQUAL "H7")
277+
elseif(INFO_FAMILY STREQUAL "H7")
278278
stm32h7_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} "${INFO_CORE}" RAM FLASH_ORIGIN RAM_ORIGIN TWO_FLASH_BANKS)
279-
elseif(FAMILY STREQUAL "WL")
279+
elseif(INFO_FAMILY STREQUAL "WL")
280280
stm32wl_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} "${INFO_CORE}" RAM FLASH_ORIGIN RAM_ORIGIN TWO_FLASH_BANKS)
281-
elseif(FAMILY STREQUAL "WB")
281+
elseif(INFO_FAMILY STREQUAL "WB")
282282
stm32wb_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} "${INFO_CORE}" RAM RAM_ORIGIN TWO_FLASH_BANKS)
283-
elseif(FAMILY STREQUAL "MP1")
283+
elseif(INFO_FAMILY STREQUAL "MP1")
284284
stm32mp1_get_memory_info(${INFO_DEVICE} ${INFO_TYPE} FLASH)
285285
endif()
286286
# when a device is dual core, each core uses half of total flash

0 commit comments

Comments
 (0)