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

Merge pull request #7640 from 0xc0170/fix_iar_definition_duplicate 

iar: remove nxp duplicate definitions
pull/7734/head
Cruz Monrreal 2018-08-08 07:36:49 -05:00 committed by GitHub
parent 4e0112c1b6 129ef46c7f
commit 95c623359e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/export/iar/iar_definitions.json
View File

@ -57,8 +57,9 @@
"OGChipSelectEditMenu": "STM32F070RB\tST STM32F070RB" "OGChipSelectEditMenu": "STM32F070RB\tST STM32F070RB"
}, },
"MK22DN512xxx5": { "MK22DN512xxx5": {
"OGChipSelectEditMenu": "MK22DN512xxx5\tNXP MK22DN512xxx5" "OGChipSelectEditMenu": "MK22FN512xxx12\tFreescale MK22FN512xxx12"
}, },
"MK24FN1M0xxx12": { "MK24FN1M0xxx12": {
"OGChipSelectEditMenu": "MK24FN1M0xxx12\tNXP MK24FN1M0xxx12" "OGChipSelectEditMenu": "MK24FN1M0xxx12\tNXP MK24FN1M0xxx12"
}, },
@ -154,9 +155,6 @@
"FPU2": 7, "FPU2": 7,
"NrRegs": 1 "NrRegs": 1
}, },
"MKL43Z256xxx4": {
"OGChipSelectEditMenu": "MKL43Z256xxx4\tFreescale MKL43Z256xxx4"
},
"LPC812M101JDH20": { "LPC812M101JDH20": {
"OGChipSelectEditMenu": "LPC812M101\tNXP LPC812M101" "OGChipSelectEditMenu": "LPC812M101\tNXP LPC812M101"
}, },
@ -185,9 +183,6 @@
"STM32F446ZE": { "STM32F446ZE": {
"OGChipSelectEditMenu": "STM32F446ZE\tST STM32F446ZE" "OGChipSelectEditMenu": "STM32F446ZE\tST STM32F446ZE"
}, },
"MK22DN512xxx5": {
"OGChipSelectEditMenu": "MK22FN512xxx12\tFreescale MK22FN512xxx12"
},
"STM32F303K8": { "STM32F303K8": {
"OGChipSelectEditMenu": "STM32F303x8\tST STM32F303x8" "OGChipSelectEditMenu": "STM32F303x8\tST STM32F303x8"
}, },