ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix STM32H7 dual core inheritance again (#366)

pull/15530/head
Jamie Smith 2024-09-29 21:59:09 -07:00 committed by GitHub
parent 3b7ac99133
commit 3297baedff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
targets/targets.json5
View File

@ -3421,10 +3421,10 @@
], ],
"device_name": "STM32H745ZITx" "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": { "MCU_STM32H745xI_CM4": {
"inherits": [
"MCU_STM32H745xI"
],
"public": false, "public": false,
"extra_labels_add": [ "extra_labels_add": [
"STM32H745xI_CM4" "STM32H745xI_CM4"
@ -3442,9 +3442,6 @@
] ]
}, },
"MCU_STM32H745xI_CM7": { "MCU_STM32H745xI_CM7": {
"inherits": [
"MCU_STM32H745xI"
],
"public": false, "public": false,
"extra_labels_add": [ "extra_labels_add": [
"STM32H745xI_CM7" "STM32H745xI_CM7"
@ -3463,6 +3460,7 @@
] ]
}, },
"NUCLEO_H745ZI_Q": { "NUCLEO_H745ZI_Q": {
"inherits": ["MCU_STM32H745xI"],
"supported_form_factors": [ "supported_form_factors": [
"ARDUINO_UNO" "ARDUINO_UNO"
], ],
@ -3508,10 +3506,9 @@
"STM32H747xx" "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": { "MCU_STM32H747xI_CM7": {
"inherits": [
"MCU_STM32H747xI"
],
"public": false, "public": false,
"extra_labels_add": [ "extra_labels_add": [
"STM32H747xI_CM7" "STM32H747xI_CM7"
@ -3530,9 +3527,6 @@
] ]
}, },
"MCU_STM32H747xI_CM4": { "MCU_STM32H747xI_CM4": {
"inherits": [
"MCU_STM32H747xI"
],
"public": false, "public": false,
"extra_labels_add": [ "extra_labels_add": [
"STM32H747xI_CM4" "STM32H747xI_CM4"
@ -3557,6 +3551,7 @@
"DISCO_H747I": { "DISCO_H747I": {
"image_url": "https://mm.digikey.com/Volume0/opasdata/d220001/medias/images/310/MFG_STM32H747I-DISCO.jpg", "image_url": "https://mm.digikey.com/Volume0/opasdata/d220001/medias/images/310/MFG_STM32H747I-DISCO.jpg",
"public": false, "public": false,
"inherits": ["MCU_STM32H747xI"],
"overrides": { "overrides": {
"system_power_supply": "PWR_DIRECT_SMPS_SUPPLY", "system_power_supply": "PWR_DIRECT_SMPS_SUPPLY",
// Cannot enable overdrive mode because the default power supply is SMPS // Cannot enable overdrive mode because the default power supply is SMPS
@ -3564,9 +3559,11 @@
} }
}, },
"DISCO_H747I_CM7": { "DISCO_H747I_CM7": {
// NOTE: inherit from MCU_STM32H747xI_CM7 first so that target's attributes get priority over
// DISCO_H747I's attributes.
"inherits": [ "inherits": [
"MCU_STM32H747xI_CM7", "MCU_STM32H747xI_CM7",
"DISCO_H747" "DISCO_H747I"
], ],
"supported_form_factors": [ "supported_form_factors": [
"ARDUINO_UNO", "ARDUINO_UNO",
@ -3591,7 +3588,7 @@
"DISCO_H747I_CM4": { "DISCO_H747I_CM4": {
"inherits": [ "inherits": [
"MCU_STM32H747xI_CM4", "MCU_STM32H747xI_CM4",
"DISCO_H747" "DISCO_H747I"
], ],
"extra_labels_add": [ "extra_labels_add": [
"DISCO_H747I", "DISCO_H747I",
@ -3669,10 +3666,10 @@
"image_url": "https://store.arduino.cc/cdn/shop/products/ABX00042_00.iso_1200x900.jpg?v=1675840144" "image_url": "https://store.arduino.cc/cdn/shop/products/ABX00042_00.iso_1200x900.jpg?v=1675840144"
}, },
"ARDUINO_PORTENTA_H7_M7": { "ARDUINO_PORTENTA_H7_M7": {
"inherits": ["ARDUINO_PORTENTA_H7", "MCU_STM32H747xI_CM7"], "inherits": ["MCU_STM32H747xI_CM7", "ARDUINO_PORTENTA_H7"]
}, },
"ARDUINO_PORTENTA_H7_M4": { "ARDUINO_PORTENTA_H7_M4": {
"inherits": ["ARDUINO_PORTENTA_H7", "MCU_STM32H747xI_CM4"], "inherits": ["MCU_STM32H747xI_CM4", "ARDUINO_PORTENTA_H7"]
}, },
"MCU_STM32H750xB": { "MCU_STM32H750xB": {
"inherits": [ "inherits": [