Skip to content

iar: remove nxp duplicate definitions #7640

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

Merged
merged 4 commits into from
Aug 8, 2018
Merged

iar: remove nxp duplicate definitions #7640

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80d58e5
iar: remove nxp duplicate definitions
0xc0170 Jul 30, 2018
eb5b117
frdm-k22f: fix IAR definition
0xc0170 Aug 3, 2018
6f6a516
iar: kl43 - use nxp MCU definition
0xc0170 Aug 3, 2018
129ef46
iar: MK22F use xx12 Freescale for 7.80.x
0xc0170 Aug 7, 2018
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
9 changes: 2 additions & 7 deletions tools/export/iar/iar_definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@
"OGChipSelectEditMenu": "STM32F070RB\tST STM32F070RB"
},
"MK22DN512xxx5": {
"OGChipSelectEditMenu": "MK22DN512xxx5\tNXP MK22DN512xxx5"
"OGChipSelectEditMenu": "MK22FN512xxx12\tFreescale MK22FN512xxx12"
},

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