Merge pull request #1390 from Rocky04/fix_f4_sram_memory_map

Dynamic SRAM size for F4 memory map
pull/1397/head^2
nightwalker-87 2024-05-13 23:01:53 +02:00 zatwierdzone przez GitHub
commit dce9d6e820
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -355,7 +355,8 @@ char* make_memory_map(stlink_t *sl) {
if (sl->chip_id == STM32_CHIPID_F4 || if (sl->chip_id == STM32_CHIPID_F4 ||
sl->chip_id == STM32_CHIPID_F446 || sl->chip_id == STM32_CHIPID_F446 ||
sl->chip_id == STM32_CHIPID_F411xx) { sl->chip_id == STM32_CHIPID_F411xx) {
strcpy(map, memory_map_template_F4); snprintf(map, sz, memory_map_template_F4,
sl->sram_size);
} else if (sl->chip_id == STM32_CHIPID_F4_DE) { } else if (sl->chip_id == STM32_CHIPID_F4_DE) {
strcpy(map, memory_map_template_F4_DE); strcpy(map, memory_map_template_F4_DE);
} else if (sl->core_id == STM32_CORE_ID_M7F_SWD) { } else if (sl->core_id == STM32_CORE_ID_M7F_SWD) {

Wyświetl plik

@ -8,7 +8,7 @@ static const char* const memory_map_template_F4 =
"<memory-map>" "<memory-map>"
" <memory type=\"rom\" start=\"0x00000000\" length=\"0x100000\"/>" // code = sram, bootrom or flash; flash is bigger " <memory type=\"rom\" start=\"0x00000000\" length=\"0x100000\"/>" // code = sram, bootrom or flash; flash is bigger
" <memory type=\"ram\" start=\"0x10000000\" length=\"0x10000\"/>" // ccm ram " <memory type=\"ram\" start=\"0x10000000\" length=\"0x10000\"/>" // ccm ram
" <memory type=\"ram\" start=\"0x20000000\" length=\"0x20000\"/>" // sram " <memory type=\"ram\" start=\"0x20000000\" length=\"0x%x\"/>" // sram
" <memory type=\"flash\" start=\"0x08000000\" length=\"0x10000\">" // Sectors 0...3 " <memory type=\"flash\" start=\"0x08000000\" length=\"0x10000\">" // Sectors 0...3
" <property name=\"blocksize\">0x4000</property>" // 16 kB " <property name=\"blocksize\">0x4000</property>" // 16 kB
" </memory>" " </memory>"