Skip to content

Commit 71e9cdb

Browse files
committed
[dfg] Fixes for CubeMX update
1 parent fb9333a commit 71e9cdb

3 files changed

Lines changed: 26 additions & 6 deletions

File tree

tools/generator/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ clean_extract:
5656
@rm -rf raw-device-data/
5757

5858
.PHONY: update-data-%
59-
update-data-%:
59+
update-data-%: update_init
6060
rm -rf $(@:update-data-%=raw-device-data/%-devices)
6161
@$(MAKE) $(@:update-data-%=raw-device-data/%-devices)
6262

63+
6364
.PHONY: update-data
6465
update-data: update-data-avr update-data-stm32 update-data-sam \
65-
update-data-nrf update-data-rp update_init
66+
update-data-nrf update-data-rp
6667

6768

6869
# AVR device files

tools/generator/dfg/stm32/stm.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -531,11 +531,9 @@ def fixMemoryForDevice(did, memories: dict[str, dict], header) -> list[dict]:
531531
mems["sram1"] = mems.pop("sram")
532532
add_ram(mems, "sram2", sram2, target="sram1")
533533

534-
elif did.family == "h5":
535-
# Fix missing Backup and SRAM2/3
534+
elif did.family == "h5" and did.name in ["03"]:
535+
# Fix missing Backup
536536
sizes = header.get_memory_sizes()
537-
if (sram3 := sizes.get("SRAM3")): add_ram(mems, "sram3", sram3, target="sram1")
538-
if (sram2 := sizes.get("SRAM2")): add_ram(mems, "sram2", sram2, target="sram1")
539537
mems["backup"] = {"start": 0x40036400, "size": sizes["BKPSRAM"], "access": "rwx"}
540538

541539
elif did.family == "h7":

tools/generator/dfg/stm32/stm_groups.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,17 @@
9090
'name': ['74', '84']
9191
},
9292

93+
# STM32H5 devices
94+
{
95+
'family': ['h5'],
96+
'name': ['e4', 'e5', 'f4', 'f5'],
97+
'variant': ['']
98+
},{
99+
'family': ['h5'],
100+
'name': ['e4', 'e5', 'f4', 'f5'],
101+
'variant': ['q']
102+
},
103+
93104
# STM32H7 devices
94105
{
95106
'family': ['h7'],
@@ -159,6 +170,16 @@
159170
# STM32L5 devices
160171
# STM32U0 devices
161172
# STM32U3 devices
173+
{
174+
'family': ['u3'],
175+
'name': ['b5', 'c5'],
176+
'variant': ['']
177+
},{
178+
'family': ['u3'],
179+
'name': ['b5', 'c5'],
180+
'variant': ['q']
181+
},
182+
162183
# STM32U5 devices
163184
{
164185
'family': ['u5'],

0 commit comments

Comments
 (0)