From 80d58e55722107d2d004704de7b6050f0eb2e91e Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 30 Jul 2018 11:49:24 +0100 Subject: [PATCH 1/4] iar: remove nxp duplicate definitions Fixes #7634 --- tools/export/iar/iar_definitions.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json index e348a8dad60..c354e64784b 100644 --- a/tools/export/iar/iar_definitions.json +++ b/tools/export/iar/iar_definitions.json @@ -154,9 +154,6 @@ "FPU2": 7, "NrRegs": 1 }, - "MKL43Z256xxx4": { - "OGChipSelectEditMenu": "MKL43Z256xxx4\tFreescale MKL43Z256xxx4" - }, "LPC812M101JDH20": { "OGChipSelectEditMenu": "LPC812M101\tNXP LPC812M101" }, @@ -185,9 +182,6 @@ "STM32F446ZE": { "OGChipSelectEditMenu": "STM32F446ZE\tST STM32F446ZE" }, - "MK22DN512xxx5": { - "OGChipSelectEditMenu": "MK22FN512xxx12\tFreescale MK22FN512xxx12" - }, "STM32F303K8": { "OGChipSelectEditMenu": "STM32F303x8\tST STM32F303x8" }, From eb5b117d98a88adda231289130cfcfb54c59a2f7 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Fri, 3 Aug 2018 11:53:47 +0100 Subject: [PATCH 2/4] frdm-k22f: fix IAR definition Based on the https://www.keil.com/boards2/nxp/frdm_k22f/ - it contains xxx12 MCU. However IAR 7.80 has only xxx5 version, thus leaving NXP added version as xxx5. --- tools/export/iar/iar_definitions.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json index c354e64784b..ab811365cb5 100644 --- a/tools/export/iar/iar_definitions.json +++ b/tools/export/iar/iar_definitions.json @@ -154,6 +154,9 @@ "FPU2": 7, "NrRegs": 1 }, + "MKL43Z256xxx4": { + "OGChipSelectEditMenu": "MKL43Z256xxx4\tFreescale MKL43Z256xxx4" + }, "LPC812M101JDH20": { "OGChipSelectEditMenu": "LPC812M101\tNXP LPC812M101" }, From 6f6a516b668a6e5b70f83ad7fa070372d066e21d Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Fri, 3 Aug 2018 12:19:20 +0100 Subject: [PATCH 3/4] iar: kl43 - use nxp MCU definition --- tools/export/iar/iar_definitions.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json index ab811365cb5..c354e64784b 100644 --- a/tools/export/iar/iar_definitions.json +++ b/tools/export/iar/iar_definitions.json @@ -154,9 +154,6 @@ "FPU2": 7, "NrRegs": 1 }, - "MKL43Z256xxx4": { - "OGChipSelectEditMenu": "MKL43Z256xxx4\tFreescale MKL43Z256xxx4" - }, "LPC812M101JDH20": { "OGChipSelectEditMenu": "LPC812M101\tNXP LPC812M101" }, From 129ef46c7f8cb08995827c5ef8645fa160e3861f Mon Sep 17 00:00:00 2001 From: Martin Kojtal <0xc0170@gmail.com> Date: Tue, 7 Aug 2018 15:28:35 +0100 Subject: [PATCH 4/4] iar: MK22F use xx12 Freescale for 7.80.x This fixes the failure for IAR regarding floating point. --- tools/export/iar/iar_definitions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json index c354e64784b..1ac0ebc48b6 100644 --- a/tools/export/iar/iar_definitions.json +++ b/tools/export/iar/iar_definitions.json @@ -57,8 +57,9 @@ "OGChipSelectEditMenu": "STM32F070RB\tST STM32F070RB" }, "MK22DN512xxx5": { - "OGChipSelectEditMenu": "MK22DN512xxx5\tNXP MK22DN512xxx5" + "OGChipSelectEditMenu": "MK22FN512xxx12\tFreescale MK22FN512xxx12" }, + "MK24FN1M0xxx12": { "OGChipSelectEditMenu": "MK24FN1M0xxx12\tNXP MK24FN1M0xxx12" },