From d1902def210fe652e14ae6d89c7c23e795781875 Mon Sep 17 00:00:00 2001
From: bcostm <bco.stm@gmail.com>
Date: Mon, 26 Sep 2016 10:30:56 +0200
Subject: [PATCH 1/4] sw4stm32 exporter - add hw floating point option

---
 tools/export/sw4stm32.py                   | 86 ++++++++++++----------
 tools/export/sw4stm32_cproject_common.tmpl |  4 +-
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/tools/export/sw4stm32.py b/tools/export/sw4stm32.py
index 11878cdfa91..aa4ef32872e 100644
--- a/tools/export/sw4stm32.py
+++ b/tools/export/sw4stm32.py
@@ -24,47 +24,53 @@ class Sw4STM32(Exporter):
     NAME = 'Sw4STM32'
     TOOLCHAIN = 'GCC_ARM'
 
+    # fp_hardware = no | fpv4-sp-d16
+    # fp_abi = soft | softfp | hard
     BOARDS = {
-        # 'DISCO_F051R8':     {'name': 'STM32F0DISCOVERY',        'mcuId': 'STM32F051R8Tx'},
-        # 'DISCO_F303VC':     {'name': 'STM32F3DISCOVERY',        'mcuId': 'STM32F303VCTx'},
-        'DISCO_F334C8':     {'name': 'STM32F3348DISCOVERY',     'mcuId': 'STM32F334C8Tx'},
-        # 'DISCO_F401VC':     {'name': 'STM32F401C-DISCO',        'mcuId': 'STM32F401VCTx'},
-        'DISCO_F407VG':     {'name': 'STM32F4DISCOVERY',        'mcuId': 'STM32F407VGTx'},
-        'DISCO_F429ZI':     {'name': 'STM32F429I-DISCO',        'mcuId': 'STM32F429ZITx'},
-        'DISCO_F746NG':     {'name': 'STM32F746G-DISCO',        'mcuId': 'STM32F746NGHx'},
-        'DISCO_L053C8':     {'name': 'STM32L0538DISCOVERY',     'mcuId': 'STM32L053C8Tx'},
-        'DISCO_L476VG':     {'name':  'STM32L476G-DISCO',       'mcuId': 'STM32L476VGTx'},
-        'DISCO_F469NI':     {'name': 'DISCO-F469NI',            'mcuId': 'STM32F469NIHx'},
-        'NUCLEO_F030R8':    {'name': 'NUCLEO-F030R8',           'mcuId': 'STM32F030R8Tx'},
-        'NUCLEO_F070RB':    {'name': 'NUCLEO-F070RB',           'mcuId': 'STM32F070RBTx'},
-        'NUCLEO_F072RB':    {'name': 'NUCLEO-F072RB',           'mcuId': 'STM32F072RBTx'},
-        'NUCLEO_F091RC':    {'name': 'NUCLEO-F091RC',           'mcuId': 'STM32F091RCTx'},
-        'NUCLEO_F103RB':    {'name': 'NUCLEO-F103RB',           'mcuId': 'STM32F103RBTx'},
-        'NUCLEO_F207ZG':    {'name': 'NUCLEO-F207ZG',           'mcuId': 'STM32F207ZGTx'},
-        'NUCLEO_F302R8':    {'name': 'NUCLEO-F302R8',           'mcuId': 'STM32F302R8Tx'},
-        'NUCLEO_F303RE':    {'name': 'NUCLEO-F303RE',           'mcuId': 'STM32F303RETx'},
-        'NUCLEO_F334R8':    {'name': 'NUCLEO-F334R8',           'mcuId': 'STM32F334R8Tx'},
-        'NUCLEO_F303ZE':    {'name': 'NUCLEO-F303ZE',           'mcuId': 'STM32F303ZETx'},
-        'NUCLEO_F401RE':    {'name': 'NUCLEO-F401RE',           'mcuId': 'STM32F401RETx'},
-        'NUCLEO_F429ZI':    {'name': 'NUCLEO-F429ZI',           'mcuId': 'STM32F429ZITx'},
-        'NUCLEO_F411RE':    {'name': 'NUCLEO-F411RE',           'mcuId': 'STM32F411RETx'},
-        'NUCLEO_F446RE':    {'name': 'NUCLEO-F446RE',           'mcuId': 'STM32F446RETx'},
-        'NUCLEO_F446ZE':    {'name': 'NUCLEO-F446ZE',           'mcuId': 'STM32F446ZETx'},
-        'NUCLEO_L011K4':    {'name': 'NUCLEO-L011K4',           'mcuId': 'STM32L011K4Tx'},
-        'NUCLEO_L031K6':    {'name': 'NUCLEO-L031K6',           'mcuId': 'STM32L031K6Tx'},
-        'NUCLEO_L053R8':    {'name': 'NUCLEO-L053R8',           'mcuId': 'STM32L053R8Tx'},
-        'NUCLEO_L073RZ':    {'name': 'NUCLEO-L073RZ',           'mcuId': 'STM32L073RZTx'},
-        'NUCLEO_L152RE':    {'name': 'NUCLEO-L152RE',           'mcuId': 'STM32L152RETx'},
-        'NUCLEO_L432KC':    {'name': 'NUCLEO-L432KC',           'mcuId': 'STM32L432KCUx'},
-        'NUCLEO_L476RG':    {'name': 'NUCLEO-L476RG',           'mcuId': 'STM32L476RGTx'},
-        'NUCLEO_F031K6':    {'name': 'NUCLEO-F031K6',           'mcuId': 'STM32F031K6Tx'},
-        'NUCLEO_F042K6':    {'name': 'NUCLEO-F042K6',           'mcuId': 'STM32F042K6Tx'},
-        'NUCLEO_F303K8':    {'name': 'NUCLEO-F303K8',           'mcuId': 'STM32F303K8Tx'},
-        'NUCLEO_F410RB':    {'name': 'NUCLEO-F410RB',           'mcuId': 'STM32F410RBTx'},
+        'B96B_F446VE':      {'name': 'B96B-F446VE',           'mcuId': 'STM32F446VETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F051R8':     {'name': 'STM32F0DISCOVERY',      'mcuId': 'STM32F051R8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'DISCO_F303VC':     {'name': 'STM32F3DISCOVERY',      'mcuId': 'STM32F303VCTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F334C8':     {'name': 'STM32F3348DISCOVERY',   'mcuId': 'STM32F334C8Tx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F401VC':     {'name': 'STM32F401C-DISCO',      'mcuId': 'STM32F401VCTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F407VG':     {'name': 'STM32F4DISCOVERY',      'mcuId': 'STM32F407VGTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F429ZI':     {'name': 'STM32F429I-DISCO',      'mcuId': 'STM32F429ZITx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F469NI':     {'name': 'DISCO-F469NI',          'mcuId': 'STM32F469NIHx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F746NG':     {'name': 'STM32F746G-DISCO',      'mcuId': 'STM32F746NGHx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F769NI':     {'name': 'DISCO-F769NI',          'mcuId': 'STM32F769NIHx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_L053C8':     {'name': 'STM32L0538DISCOVERY',   'mcuId': 'STM32L053C8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'DISCO_L476VG':     {'name': 'STM32L476G-DISCO',      'mcuId': 'STM32L476VGTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F030R8':    {'name': 'NUCLEO-F030R8',         'mcuId': 'STM32F030R8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F031K6':    {'name': 'NUCLEO-F031K6',         'mcuId': 'STM32F031K6Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F042K6':    {'name': 'NUCLEO-F042K6',         'mcuId': 'STM32F042K6Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F070RB':    {'name': 'NUCLEO-F070RB',         'mcuId': 'STM32F070RBTx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F072RB':    {'name': 'NUCLEO-F072RB',         'mcuId': 'STM32F072RBTx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F091RC':    {'name': 'NUCLEO-F091RC',         'mcuId': 'STM32F091RCTx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F103RB':    {'name': 'NUCLEO-F103RB',         'mcuId': 'STM32F103RBTx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F207ZG':    {'name': 'NUCLEO-F207ZG',         'mcuId': 'STM32F207ZGTx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_F302R8':    {'name': 'NUCLEO-F302R8',         'mcuId': 'STM32F302R8Tx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F303K8':    {'name': 'NUCLEO-F303K8',         'mcuId': 'STM32F303K8Tx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F303RE':    {'name': 'NUCLEO-F303RE',         'mcuId': 'STM32F303RETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F303ZE':    {'name': 'NUCLEO-F303ZE',         'mcuId': 'STM32F303ZETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F334R8':    {'name': 'NUCLEO-F334R8',         'mcuId': 'STM32F334R8Tx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F401RE':    {'name': 'NUCLEO-F401RE',         'mcuId': 'STM32F401RETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F410RB':    {'name': 'NUCLEO-F410RB',         'mcuId': 'STM32F410RBTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F411RE':    {'name': 'NUCLEO-F411RE',         'mcuId': 'STM32F411RETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F429ZI':    {'name': 'NUCLEO-F429ZI',         'mcuId': 'STM32F429ZITx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F446RE':    {'name': 'NUCLEO-F446RE',         'mcuId': 'STM32F446RETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F446ZE':    {'name': 'NUCLEO-F446ZE',         'mcuId': 'STM32F446ZETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F746ZG':    {'name': 'NUCLEO-F746ZG',         'mcuId': 'STM32F746ZGTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F767ZI':    {'name': 'NUCLEO-F767ZI',         'mcuId': 'STM32F767ZITx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_L011K4':    {'name': 'NUCLEO-L011K4',         'mcuId': 'STM32L011K4Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_L031K6':    {'name': 'NUCLEO-L031K6',         'mcuId': 'STM32L031K6Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_L053R8':    {'name': 'NUCLEO-L053R8',         'mcuId': 'STM32L053R8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_L073RZ':    {'name': 'NUCLEO-L073RZ',         'mcuId': 'STM32L073RZTx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_L152RE':    {'name': 'NUCLEO-L152RE',         'mcuId': 'STM32L152RETx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
+        'NUCLEO_L432KC':    {'name': 'NUCLEO-L432KC',         'mcuId': 'STM32L432KCUx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_L476RG':    {'name': 'NUCLEO-L476RG',         'mcuId': 'STM32L476RGTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
     }
 
     TARGETS = BOARDS.keys()
-
+        
     def __gen_dir(self, dirname):
         settings = join(self.export_dir, dirname)
         mkdir(settings)
@@ -77,7 +83,7 @@ def generate(self):
         for lib in self.resources.libraries:
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])
-
+        
         ctx = {
             'name': self.project_name,
             'include_paths': self.resources.inc_dirs,
@@ -94,7 +100,9 @@ def generate(self):
             'release_config_uid': self.__generate_uid(),
             'release_tool_compiler_uid': self.__generate_uid(),
             'release_tool_compiler_input_uid': self.__generate_uid(),
-            'uid': self.__generate_uid()
+            'uid': self.__generate_uid(),
+            'floating_point_hardware': self.BOARDS[self.target.upper()]['fp_hardware'],
+            'floating_point_abi': self.BOARDS[self.target.upper()]['fp_abi']
         }
 
         self.__gen_dir('.settings')
diff --git a/tools/export/sw4stm32_cproject_common.tmpl b/tools/export/sw4stm32_cproject_common.tmpl
index 0128f69b55c..c0e3a1f72bd 100644
--- a/tools/export/sw4stm32_cproject_common.tmpl
+++ b/tools/export/sw4stm32_cproject_common.tmpl
@@ -19,7 +19,9 @@
 						<toolChain id="fr.ac6.managedbuild.toolchain.gnu.cross.exe.debug.{{uid}}" name="Ac6 STM32 MCU GCC" superClass="fr.ac6.managedbuild.toolchain.gnu.cross.exe.debug">
 							<option id="fr.ac6.managedbuild.option.gnu.cross.mcu.{{uid}}" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" value="{{mcu_name}}" valueType="string"/>
 							<option id="fr.ac6.managedbuild.option.gnu.cross.board.{{uid}}" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" value="{{board_name}}" valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.{{uid}}" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
+							<option id="fr.ac6.managedbuild.option.gnu.cross.fpu.{{uid}}" name="Floating point hardware" superClass="fr.ac6.managedbuild.option.gnu.cross.fpu" value="fr.ac6.managedbuild.option.gnu.cross.fpu.{{floating_point_hardware}}" valueType="enumerated"/>
+							<option id="fr.ac6.managedbuild.option.gnu.cross.floatabi.{{uid}}" name="Floating-point ABI" superClass="fr.ac6.managedbuild.option.gnu.cross.floatabi" value="fr.ac6.managedbuild.option.gnu.cross.floatabi.{{floating_point_abi}}" valueType="enumerated"/>
+                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.{{uid}}" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
 							<builder buildPath="${workspace_loc:/{{name}}}/Debug" id="fr.ac6.managedbuild.builder.gnu.cross.{{uid}}" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
 							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.{{debug_tool_compiler_uid}}" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler">
 								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.{{uid}}" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>

From e4c2ea8e55c282c2a396091b78d348ecedd3bf56 Mon Sep 17 00:00:00 2001
From: bcostm <bco.stm@gmail.com>
Date: Mon, 26 Sep 2016 10:36:36 +0200
Subject: [PATCH 2/4] Add tabs

---
 tools/export/sw4stm32_cproject_common.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/export/sw4stm32_cproject_common.tmpl b/tools/export/sw4stm32_cproject_common.tmpl
index c0e3a1f72bd..94f1062f1f2 100644
--- a/tools/export/sw4stm32_cproject_common.tmpl
+++ b/tools/export/sw4stm32_cproject_common.tmpl
@@ -21,7 +21,7 @@
 							<option id="fr.ac6.managedbuild.option.gnu.cross.board.{{uid}}" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" value="{{board_name}}" valueType="string"/>
 							<option id="fr.ac6.managedbuild.option.gnu.cross.fpu.{{uid}}" name="Floating point hardware" superClass="fr.ac6.managedbuild.option.gnu.cross.fpu" value="fr.ac6.managedbuild.option.gnu.cross.fpu.{{floating_point_hardware}}" valueType="enumerated"/>
 							<option id="fr.ac6.managedbuild.option.gnu.cross.floatabi.{{uid}}" name="Floating-point ABI" superClass="fr.ac6.managedbuild.option.gnu.cross.floatabi" value="fr.ac6.managedbuild.option.gnu.cross.floatabi.{{floating_point_abi}}" valueType="enumerated"/>
-                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.{{uid}}" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.{{uid}}" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
 							<builder buildPath="${workspace_loc:/{{name}}}/Debug" id="fr.ac6.managedbuild.builder.gnu.cross.{{uid}}" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
 							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.{{debug_tool_compiler_uid}}" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler">
 								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.{{uid}}" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>

From 464dbc446b3b483beaa220fbb1390de8cda8c4df Mon Sep 17 00:00:00 2001
From: bcostm <bco.stm@gmail.com>
Date: Mon, 26 Sep 2016 15:56:46 +0200
Subject: [PATCH 3/4] Correct fpu option for Cortex-M7FD devices

---
 tools/export/sw4stm32.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/export/sw4stm32.py b/tools/export/sw4stm32.py
index aa4ef32872e..49ef678c448 100644
--- a/tools/export/sw4stm32.py
+++ b/tools/export/sw4stm32.py
@@ -24,7 +24,7 @@ class Sw4STM32(Exporter):
     NAME = 'Sw4STM32'
     TOOLCHAIN = 'GCC_ARM'
 
-    # fp_hardware = no | fpv4-sp-d16
+    # fp_hardware = no | fpv4-sp-d16 | fpv5-d16
     # fp_abi = soft | softfp | hard
     BOARDS = {
         'B96B_F446VE':      {'name': 'B96B-F446VE',           'mcuId': 'STM32F446VETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
@@ -36,7 +36,7 @@ class Sw4STM32(Exporter):
         'DISCO_F429ZI':     {'name': 'STM32F429I-DISCO',      'mcuId': 'STM32F429ZITx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
         'DISCO_F469NI':     {'name': 'DISCO-F469NI',          'mcuId': 'STM32F469NIHx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
         'DISCO_F746NG':     {'name': 'STM32F746G-DISCO',      'mcuId': 'STM32F746NGHx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
-        'DISCO_F769NI':     {'name': 'DISCO-F769NI',          'mcuId': 'STM32F769NIHx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'DISCO_F769NI':     {'name': 'DISCO-F769NI',          'mcuId': 'STM32F769NIHx', 'fp_hardware': 'fpv5-d16',      'fp_abi': 'softfp'},
         'DISCO_L053C8':     {'name': 'STM32L0538DISCOVERY',   'mcuId': 'STM32L053C8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
         'DISCO_L476VG':     {'name': 'STM32L476G-DISCO',      'mcuId': 'STM32L476VGTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
         'NUCLEO_F030R8':    {'name': 'NUCLEO-F030R8',         'mcuId': 'STM32F030R8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
@@ -59,7 +59,7 @@ class Sw4STM32(Exporter):
         'NUCLEO_F446RE':    {'name': 'NUCLEO-F446RE',         'mcuId': 'STM32F446RETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
         'NUCLEO_F446ZE':    {'name': 'NUCLEO-F446ZE',         'mcuId': 'STM32F446ZETx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
         'NUCLEO_F746ZG':    {'name': 'NUCLEO-F746ZG',         'mcuId': 'STM32F746ZGTx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
-        'NUCLEO_F767ZI':    {'name': 'NUCLEO-F767ZI',         'mcuId': 'STM32F767ZITx', 'fp_hardware': 'fpv4-sp-d16',   'fp_abi': 'softfp'},
+        'NUCLEO_F767ZI':    {'name': 'NUCLEO-F767ZI',         'mcuId': 'STM32F767ZITx', 'fp_hardware': 'fpv5-d16',      'fp_abi': 'softfp'},
         'NUCLEO_L011K4':    {'name': 'NUCLEO-L011K4',         'mcuId': 'STM32L011K4Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
         'NUCLEO_L031K6':    {'name': 'NUCLEO-L031K6',         'mcuId': 'STM32L031K6Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },
         'NUCLEO_L053R8':    {'name': 'NUCLEO-L053R8',         'mcuId': 'STM32L053R8Tx', 'fp_hardware': 'no',            'fp_abi': 'soft'  },

From 89430b95bbd2404675fdba57d4f4a9032ad50c5f Mon Sep 17 00:00:00 2001
From: bcostm <bco.stm@gmail.com>
Date: Tue, 27 Sep 2016 16:35:34 +0200
Subject: [PATCH 4/4] Remove extra spaces

---
 tools/export/sw4stm32.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/export/sw4stm32.py b/tools/export/sw4stm32.py
index 49ef678c448..df8aafd77a5 100644
--- a/tools/export/sw4stm32.py
+++ b/tools/export/sw4stm32.py
@@ -70,7 +70,7 @@ class Sw4STM32(Exporter):
     }
 
     TARGETS = BOARDS.keys()
-        
+
     def __gen_dir(self, dirname):
         settings = join(self.export_dir, dirname)
         mkdir(settings)
@@ -83,7 +83,7 @@ def generate(self):
         for lib in self.resources.libraries:
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])
-        
+
         ctx = {
             'name': self.project_name,
             'include_paths': self.resources.inc_dirs,