diff --git a/tools/export/iar/__init__.py b/tools/export/iar/__init__.py
index 3951d915cd..b075c7c9e6 100644
--- a/tools/export/iar/__init__.py
+++ b/tools/export/iar/__init__.py
@@ -64,8 +64,10 @@ class IAR(Exporter):
             "GFPUCoreSlave": '',
             "GFPUCoreSlave2": 40,
             "GBECoreSlave": 35,
+            "GBECoreSlave2": '',
             "FPU2": 0,
             "NrRegs": 0,
+            "NEON": '',
         }
 
         iar_defaults.update(device_info)
diff --git a/tools/export/iar/ewp.tmpl b/tools/export/iar/ewp.tmpl
index 943c148cbc..cf5b7f0e6e 100644
--- a/tools/export/iar/ewp.tmpl
+++ b/tools/export/iar/ewp.tmpl
@@ -131,7 +131,7 @@
         <option>
           <name>GBECoreSlave</name>
           <version>24</version>
-          <state>{{GBECoreSlave}}</state>
+          <state>{{device.GBECoreSlave}}</state>
         </option>
         <option>
           <name>OGUseCmsis</name>