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

Resolved conflict in targets/targets.json

pull/7631/head
Ganesh Ramachandran 2018-07-19 16:32:51 +05:30 committed by Cruz Monrreal II
parent 83d95ad918
commit 82ce7c87c1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
targets/targets.json
View File

@ -4325,5 +4325,17 @@
"release_versions": ["5"], "release_versions": ["5"],
"device_name": "M2351KIAAEES", "device_name": "M2351KIAAEES",
"bootloader_supported": true "bootloader_supported": true
},
"TMPM3H6": {
"inherits": ["Target"],
"core": "Cortex-M3",
"is_disk_virtual": true,
"extra_labels": ["TOSHIBA"],
"macros": ["__TMPM3H6__"],
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
"device_has": ["USTICKER", "ANALOGIN", "ANALOGOUT", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "I2C", "I2CSLAVE", "STDIO_MESSAGES"],
"device_name": "TMPM3H6FWFG",
"detect_code": ["7012"],
"release_versions": ["5"]
} }
} }