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

Jump to bottom

Fix STM32H7 dual core inheritance again #366

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Fix STM32H7 dual core inheritance again #366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 15 additions & 18 deletions targets/targets.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3421,10 +3421,10 @@
],
"device_name": "STM32H745ZITx"
},

// These targets contain the extra bits to add to the MCU_STM32H745xI target to set it for the
// CM4 or CM7 core.
"MCU_STM32H745xI_CM4": {
"inherits": [
"MCU_STM32H745xI"
],
"public": false,
"extra_labels_add": [
"STM32H745xI_CM4"
Expand All @@ -3442,9 +3442,6 @@
]
},
"MCU_STM32H745xI_CM7": {
"inherits": [
"MCU_STM32H745xI"
],
"public": false,
"extra_labels_add": [
"STM32H745xI_CM7"
Expand All @@ -3463,6 +3460,7 @@
]
},
"NUCLEO_H745ZI_Q": {
"inherits": ["MCU_STM32H745xI"],
"supported_form_factors": [
"ARDUINO_UNO"
],
Expand Down Expand Up @@ -3508,10 +3506,9 @@
"STM32H747xx"
]
},
// These targets contain the extra bits to add to the MCU_STM32H747xI target to set it for the
// CM4 or CM7 core.
"MCU_STM32H747xI_CM7": {
"inherits": [
"MCU_STM32H747xI"
],
"public": false,
"extra_labels_add": [
"STM32H747xI_CM7"
Expand All @@ -3530,9 +3527,6 @@
]
},
"MCU_STM32H747xI_CM4": {
"inherits": [
"MCU_STM32H747xI"
],
"public": false,
"extra_labels_add": [
"STM32H747xI_CM4"
Expand All @@ -3557,16 +3551,19 @@
"DISCO_H747I": {
"image_url": "https://mm.digikey.com/Volume0/opasdata/d220001/medias/images/310/MFG_STM32H747I-DISCO.jpg",
"public": false,
"inherits": ["MCU_STM32H747xI"],
"overrides": {
"system_power_supply": "PWR_DIRECT_SMPS_SUPPLY",
// Cannot enable overdrive mode because the default power supply is SMPS
"enable-overdrive-mode": 0
}
},
"DISCO_H747I_CM7": {
// NOTE: inherit from MCU_STM32H747xI_CM7 first so that target's attributes get priority over
// DISCO_H747I's attributes.
"inherits": [
"MCU_STM32H747xI_CM7",
"DISCO_H747"
"MCU_STM32H747xI_CM7",
"DISCO_H747I"
],
"supported_form_factors": [
"ARDUINO_UNO",
Expand All @@ -3590,8 +3587,8 @@
},
"DISCO_H747I_CM4": {
"inherits": [
"MCU_STM32H747xI_CM4",
"DISCO_H747"
"MCU_STM32H747xI_CM4",
"DISCO_H747I"
],
"extra_labels_add": [
"DISCO_H747I",
Expand Down Expand Up @@ -3669,10 +3666,10 @@
"image_url": "https://store.arduino.cc/cdn/shop/products/ABX00042_00.iso_1200x900.jpg?v=1675840144"
},
"ARDUINO_PORTENTA_H7_M7": {
"inherits": ["ARDUINO_PORTENTA_H7", "MCU_STM32H747xI_CM7"],
"inherits": ["MCU_STM32H747xI_CM7", "ARDUINO_PORTENTA_H7"]
},
"ARDUINO_PORTENTA_H7_M4": {
"inherits": ["ARDUINO_PORTENTA_H7", "MCU_STM32H747xI_CM4"],
"inherits": ["MCU_STM32H747xI_CM4", "ARDUINO_PORTENTA_H7"]
},
"MCU_STM32H750xB": {
"inherits": [
Expand Down
Loading