From 377f759304fd80ef509561a58a2b383651709ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C5=82=C4=85bek=2C=20Andrzej?=
 <andrzej.glabek@nordicsemi.no>
Date: Wed, 8 Mar 2017 11:06:35 +0100
Subject: [PATCH] IAR exporter: extended debugger settings template with
 modifiable options needed for Nordic targets.

---
 tools/export/iar/__init__.py          |  3 +++
 tools/export/iar/ewd.tmpl             |  6 +++---
 tools/export/iar/iar_definitions.json | 10 ++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/export/iar/__init__.py b/tools/export/iar/__init__.py
index b85e465e97..2c6073006f 100644
--- a/tools/export/iar/__init__.py
+++ b/tools/export/iar/__init__.py
@@ -78,6 +78,9 @@ class IAR(Exporter):
             "FPU2": 0,
             "NrRegs": 0,
             "NEON": '',
+            "CExtraOptionsCheck": 0,
+            "CExtraOptions": "",
+            "CMSISDAPJtagSpeedList": 0,
         }
 
         iar_defaults.update(device_info)
diff --git a/tools/export/iar/ewd.tmpl b/tools/export/iar/ewd.tmpl
index c5b321dcb3..debef36424 100644
--- a/tools/export/iar/ewd.tmpl
+++ b/tools/export/iar/ewd.tmpl
@@ -57,11 +57,11 @@
         </option>
         <option>
           <name>CExtraOptionsCheck</name>
-          <state>0</state>
+          <state>{{device.CExtraOptionsCheck}}</state>
         </option>
         <option>
           <name>CExtraOptions</name>
-          <state></state>
+          <state>{{device.CExtraOptions}}</state>
         </option>
         <option>
           <name>CFpuProcessor</name>
@@ -365,7 +365,7 @@
         <option>
           <name>CMSISDAPJtagSpeedList</name>
           <version>0</version>
-          <state>0</state>
+          <state>{{device.CMSISDAPJtagSpeedList}}</state>
         </option>
         <option>
           <name>CMSISDAPBreakpointRadio</name>
diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json
index f3b34ad8ec..34ea0ecb66 100644
--- a/tools/export/iar/iar_definitions.json
+++ b/tools/export/iar/iar_definitions.json
@@ -42,7 +42,10 @@
         "OGChipSelectEditMenu": "STM32F072RB\tST STM32F072RB"
     },
     "nRF51822_xxAA": {
-        "OGChipSelectEditMenu": "nRF51822-QFAA\tNordicSemi nRF51822-QFAA"
+        "OGChipSelectEditMenu": "nRF51822-QFAA\tNordicSemi nRF51822-QFAA",
+        "CExtraOptionsCheck": 1,
+        "CExtraOptions": "--drv_vector_table_base=0x0",
+        "CMSISDAPJtagSpeedList": 10
     },
     "EFM32GG990F1024": {
         "OGChipSelectEditMenu": "EFM32GG990F1024\tSiliconLaboratories EFM32GG990F1024"
@@ -163,7 +166,10 @@
         "OGChipSelectEditMenu": "STM32F407VG\tST STM32F407VG"
     },
     "nRF52832_xxAA":{
-        "OGChipSelectEditMenu": "nRF52832-xxAA\tNordicSemi nRF52832-xxAA"
+        "OGChipSelectEditMenu": "nRF52832-xxAA\tNordicSemi nRF52832-xxAA",
+        "CExtraOptionsCheck": 1,
+        "CExtraOptions": "--drv_vector_table_base=0x0",
+        "CMSISDAPJtagSpeedList": 10
     },
     "NCS36510":{
         "OGChipSelectEditMenu": "NCS36510\tONSemiconductor NCS36510"