Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix STM32H7 dual-core device files #83

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix STM32H7 dual-core device files #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8851101
[dfg] Remove all software IPs for STM32H7 dual core devices
chris-durand Apr 9, 2022
40ca6ec
[dfg] Fix CM4 core type for STM32H7 dual-core devices
chris-durand Apr 9, 2022
1be87eb
Update STM32H7 device files
chris-durand Dec 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions devices/stm32/stm32h7-23_33.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,7 @@
<signal driver="i2c" instance="3" name="tx"/>
</request>
<request position="75">
<signal driver="dcmi"/>
<signal driver="pssi"/>
<signal driver="dcmi" name="pssi"/>
</request>
<request device-name="33" position="76">
<signal driver="cryp" name="in"/>
Expand Down
3 changes: 1 addition & 2 deletions devices/stm32/stm32h7-25_35.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,7 @@
<signal driver="i2c" instance="3" name="tx"/>
</request>
<request position="75">
<signal driver="dcmi"/>
<signal driver="pssi"/>
<signal driver="dcmi" name="pssi"/>
</request>
<request device-name="35" position="76">
<signal driver="cryp" name="in"/>
Expand Down
3 changes: 1 addition & 2 deletions devices/stm32/stm32h7-30.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,7 @@
<signal driver="i2c" instance="3" name="tx"/>
</request>
<request position="75">
<signal driver="dcmi"/>
<signal driver="pssi"/>
<signal driver="dcmi" name="pssi"/>
</request>
<request position="76">
<signal driver="cryp" name="in"/>
Expand Down
2 changes: 1 addition & 1 deletion devices/stm32/stm32h7-42.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2863,7 +2863,7 @@
<pin position="E16" name="PA12"/>
<pin position="E17" name="PA11"/>
<pin position="F1" name="VSS" type="power"/>
<pin position="F2" name="VSS" type="power"/>
<pin position="F2" name="NC" type="nc"/>
<pin position="F3" name="PI10"/>
<pin position="F4" name="PI11"/>
<pin position="F5" name="VDD" type="power"/>
Expand Down
7 changes: 1 addition & 6 deletions devices/stm32/stm32h7-45_55.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<valid-device>stm32h755zit7@m4</valid-device>
<valid-device>stm32h755zit7@m7</valid-device>
<driver name="core">
<attribute-type device-core="m4" value="cortex-m4fd"/>
<attribute-type device-core="m4" value="cortex-m4f"/>
<attribute-type device-core="m7" value="cortex-m7fd"/>
<memory device-core="m7" name="itcm" access="rwx" start="0x00" size="65536"/>
<memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
Expand Down Expand Up @@ -330,18 +330,13 @@
<instance value="1"/>
<instance value="2"/>
</driver>
<driver name="openamp" type="stm32-v1.0">
<instance value="cortex-m4"/>
<instance value="cortex-m7"/>
</driver>
<driver name="pwr" type="stm32-v1.0"/>
<driver name="quadspi" type="stm32-v1.0"/>
<driver name="ramecc" type="stm32-v1.0"/>
<driver name="rcc" type="stm32-v1.0">
<max-frequency device-core="m4" value="240000000"/>
<max-frequency device-core="m7" value="480000000"/>
</driver>
<driver name="resmgr_utility" type="stm32-stm32h7_cube"/>
<driver name="rng" type="stm32"/>
<driver name="rtc" type="stm32-v2.7"/>
<driver name="sai" type="stm32-sai1_h7_cube">
Expand Down
7 changes: 1 addition & 6 deletions devices/stm32/stm32h7-47_57.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<valid-device>stm32h757ziy6@m4</valid-device>
<valid-device>stm32h757ziy6@m7</valid-device>
<driver name="core">
<attribute-type device-core="m4" value="cortex-m4fd"/>
<attribute-type device-core="m4" value="cortex-m4f"/>
<attribute-type device-core="m7" value="cortex-m7fd"/>
<memory device-core="m7" name="itcm" access="rwx" start="0x00" size="65536"/>
<memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
Expand Down Expand Up @@ -290,18 +290,13 @@
<instance value="1"/>
<instance value="2"/>
</driver>
<driver name="openamp" type="stm32-v1.0">
<instance value="cortex-m4"/>
<instance value="cortex-m7"/>
</driver>
<driver name="pwr" type="stm32-v1.0"/>
<driver name="quadspi" type="stm32-v1.0"/>
<driver name="ramecc" type="stm32-v1.0"/>
<driver name="rcc" type="stm32-v1.0">
<max-frequency device-core="m4" value="240000000"/>
<max-frequency device-core="m7" value="480000000"/>
</driver>
<driver name="resmgr_utility" type="stm32-stm32h7_cube"/>
<driver name="rng" type="stm32"/>
<driver name="rtc" type="stm32-v2.7"/>
<driver name="sai" type="stm32-sai1_h7_cube">
Expand Down
3 changes: 1 addition & 2 deletions devices/stm32/stm32h7-a3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,7 @@
<signal driver="i2c" instance="3" name="tx"/>
</request>
<request position="75">
<signal driver="dcmi"/>
<signal driver="pssi"/>
<signal driver="dcmi" name="pssi"/>
</request>
<request position="79">
<signal driver="uart" instance="7" name="rx"/>
Expand Down
3 changes: 1 addition & 2 deletions devices/stm32/stm32h7-b0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,7 @@
<signal driver="i2c" instance="3" name="tx"/>
</request>
<request position="75">
<signal driver="dcmi"/>
<signal driver="pssi"/>
<signal driver="dcmi" name="pssi"/>
</request>
<request position="76">
<signal driver="cryp" name="in"/>
Expand Down
3 changes: 1 addition & 2 deletions devices/stm32/stm32h7-b3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,7 @@
<signal driver="i2c" instance="3" name="tx"/>
</request>
<request position="75">
<signal driver="dcmi"/>
<signal driver="pssi"/>
<signal driver="dcmi" name="pssi"/>
</request>
<request position="76">
<signal driver="cryp" name="in"/>
Expand Down
5 changes: 3 additions & 2 deletions tools/generator/dfg/stm32/stm_device_tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def _properties_from_partname(partname):
def _properties_from_id(comboDeviceName, device_file, did, core):
if core.endswith("m4") or core.endswith("m7") or core.endswith("m33"):
core += "f"
if did.family in ["h7"] or (did.family in ["f7"] and did.name not in ["45", "46", "56"]):
if (did.family in ["h7"] and "m7" in core) or (did.family in ["f7"] and did.name not in ["45", "46", "56"]):
core += "d"
if "@" in did.naming_schema:
did.set("core", core[7:9])
Expand Down Expand Up @@ -150,7 +150,8 @@ def clean_up_version(version):
software_ips = {"GFXSIMULATOR", "GRAPHICS", "FATFS", "TOUCHSENSING", "PDM2PCM",
"MBEDTLS", "FREERTOS", "CORTEX_M", "NVIC", "USB_DEVICE",
"USB_HOST", "LWIP", "LIBJPEG", "GUI_INTERFACE", "TRACER",
"FILEX", "LEVELX", "THREADX", "USBX", "LINKEDLIST", "NETXDUO"}
"FILEX", "LEVELX", "THREADX", "USBX", "LINKEDLIST", "NETXDUO",
"OPENAMP", "RESMGR_UTILITY"}
if any(ip.get("Name").upper().startswith(p) for p in software_ips):
continue

Expand Down