diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
index 5840c94628..646ee7ea9c 100755
--- a/workspace_tools/targets.py
+++ b/workspace_tools/targets.py
@@ -846,7 +846,7 @@ class NUCLEO_F746ZG(Target):
         Target.__init__(self)
         self.core = "Cortex-M7F"
         self.extra_labels = ['STM', 'STM32F7', 'STM32F746', 'STM32F746ZG']
-        self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
+        self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "IAR"]
         self.detect_code = ["0816"]
         self.progen = {
             "target":"nucleo-f746zg",
@@ -1023,7 +1023,7 @@ class DISCO_F746NG(Target):
         Target.__init__(self)
         self.core = "Cortex-M7F"
         self.extra_labels = ['STM', 'STM32F7', 'STM32F746', 'STM32F746NG']
-        self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
+        self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "IAR"]
         self.detect_code = ["0815"]
         self.progen = {
             "target":"disco-f746ng",
diff --git a/workspace_tools/toolchains/iar.py b/workspace_tools/toolchains/iar.py
index 594391f1bb..5e4d1e8070 100644
--- a/workspace_tools/toolchains/iar.py
+++ b/workspace_tools/toolchains/iar.py
@@ -32,9 +32,12 @@ class IAR(mbedToolchain):
 
     def __init__(self, target, options=None, notify=None, macros=None, silent=False, extra_verbose=False):
         mbedToolchain.__init__(self, target, options, notify, macros, silent, extra_verbose=extra_verbose)
-
+        if target.core == "Cortex-M7F":
+            cpuchoice = "Cortex-M7"
+        else:
+            cpuchoice = target.core
         c_flags = [
-            "--cpu=%s" % target.core, "--thumb",
+            "--cpu=%s" % cpuchoice, "--thumb",
             "--dlib_config", join(IAR_PATH, "inc", "c", "DLib_Config_Full.h"),
             "-e", # Enable IAR language extension
             "--no_wrap_diagnostics",
@@ -45,6 +48,10 @@ class IAR(mbedToolchain):
             "--diag_suppress=Pa050,Pa084,Pa093,Pa082",
         ]
 
+        if target.core == "Cortex-M7F":
+            c_flags.append("--fpu=VFPv5_sp")
+                
+
         if "debug-info" in self.options:
             c_flags.append("-r")
             c_flags.append("-On")
@@ -53,7 +60,7 @@ class IAR(mbedToolchain):
 
         IAR_BIN = join(IAR_PATH, "bin")
         main_cc = join(IAR_BIN, "iccarm")
-        self.asm  = [join(IAR_BIN, "iasmarm")] + ["--cpu", target.core]
+        self.asm  = [join(IAR_BIN, "iasmarm")] + ["--cpu", cpuchoice]
         if not "analyze" in self.options:
             self.cc   = [main_cc] + c_flags
             self.cppc = [main_cc, "--c++",  "--no_rtti", "--no_exceptions"] + c_flags