Skip to content

Commit f22d5a7

Browse files
sg-sg-
authored
Merge pull request #2811 from bcostm/fix_sw4stm32_exporter_fpu
Fix sw4stm32 exporter fpu
2 parents f6ba3fa + 89430b9 commit f22d5a7

File tree

2 files changed

+47
-37
lines changed

2 files changed

+47
-37
lines changed

‎tools/export/sw4stm32.py

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,49 @@ class Sw4STM32(Exporter):
2424
NAME = 'Sw4STM32'
2525
TOOLCHAIN = 'GCC_ARM'
2626

27+
# fp_hardware = no | fpv4-sp-d16 | fpv5-d16
28+
# fp_abi = soft | softfp | hard
2729
BOARDS = {
28-
# 'DISCO_F051R8': {'name': 'STM32F0DISCOVERY', 'mcuId': 'STM32F051R8Tx'},
29-
# 'DISCO_F303VC': {'name': 'STM32F3DISCOVERY', 'mcuId': 'STM32F303VCTx'},
30-
'DISCO_F334C8': {'name': 'STM32F3348DISCOVERY', 'mcuId': 'STM32F334C8Tx'},
31-
# 'DISCO_F401VC': {'name': 'STM32F401C-DISCO', 'mcuId': 'STM32F401VCTx'},
32-
'DISCO_F407VG': {'name': 'STM32F4DISCOVERY', 'mcuId': 'STM32F407VGTx'},
33-
'DISCO_F429ZI': {'name': 'STM32F429I-DISCO', 'mcuId': 'STM32F429ZITx'},
34-
'DISCO_F746NG': {'name': 'STM32F746G-DISCO', 'mcuId': 'STM32F746NGHx'},
35-
'DISCO_L053C8': {'name': 'STM32L0538DISCOVERY', 'mcuId': 'STM32L053C8Tx'},
36-
'DISCO_L476VG': {'name': 'STM32L476G-DISCO', 'mcuId': 'STM32L476VGTx'},
37-
'DISCO_F469NI': {'name': 'DISCO-F469NI', 'mcuId': 'STM32F469NIHx'},
38-
'NUCLEO_F030R8': {'name': 'NUCLEO-F030R8', 'mcuId': 'STM32F030R8Tx'},
39-
'NUCLEO_F070RB': {'name': 'NUCLEO-F070RB', 'mcuId': 'STM32F070RBTx'},
40-
'NUCLEO_F072RB': {'name': 'NUCLEO-F072RB', 'mcuId': 'STM32F072RBTx'},
41-
'NUCLEO_F091RC': {'name': 'NUCLEO-F091RC', 'mcuId': 'STM32F091RCTx'},
42-
'NUCLEO_F103RB': {'name': 'NUCLEO-F103RB', 'mcuId': 'STM32F103RBTx'},
43-
'NUCLEO_F207ZG': {'name': 'NUCLEO-F207ZG', 'mcuId': 'STM32F207ZGTx'},
44-
'NUCLEO_F302R8': {'name': 'NUCLEO-F302R8', 'mcuId': 'STM32F302R8Tx'},
45-
'NUCLEO_F303RE': {'name': 'NUCLEO-F303RE', 'mcuId': 'STM32F303RETx'},
46-
'NUCLEO_F334R8': {'name': 'NUCLEO-F334R8', 'mcuId': 'STM32F334R8Tx'},
47-
'NUCLEO_F303ZE': {'name': 'NUCLEO-F303ZE', 'mcuId': 'STM32F303ZETx'},
48-
'NUCLEO_F401RE': {'name': 'NUCLEO-F401RE', 'mcuId': 'STM32F401RETx'},
49-
'NUCLEO_F429ZI': {'name': 'NUCLEO-F429ZI', 'mcuId': 'STM32F429ZITx'},
50-
'NUCLEO_F411RE': {'name': 'NUCLEO-F411RE', 'mcuId': 'STM32F411RETx'},
51-
'NUCLEO_F446RE': {'name': 'NUCLEO-F446RE', 'mcuId': 'STM32F446RETx'},
52-
'NUCLEO_F446ZE': {'name': 'NUCLEO-F446ZE', 'mcuId': 'STM32F446ZETx'},
53-
'NUCLEO_L011K4': {'name': 'NUCLEO-L011K4', 'mcuId': 'STM32L011K4Tx'},
54-
'NUCLEO_L031K6': {'name': 'NUCLEO-L031K6', 'mcuId': 'STM32L031K6Tx'},
55-
'NUCLEO_L053R8': {'name': 'NUCLEO-L053R8', 'mcuId': 'STM32L053R8Tx'},
56-
'NUCLEO_L073RZ': {'name': 'NUCLEO-L073RZ', 'mcuId': 'STM32L073RZTx'},
57-
'NUCLEO_L152RE': {'name': 'NUCLEO-L152RE', 'mcuId': 'STM32L152RETx'},
58-
'NUCLEO_L432KC': {'name': 'NUCLEO-L432KC', 'mcuId': 'STM32L432KCUx'},
59-
'NUCLEO_L476RG': {'name': 'NUCLEO-L476RG', 'mcuId': 'STM32L476RGTx'},
60-
'NUCLEO_F031K6': {'name': 'NUCLEO-F031K6', 'mcuId': 'STM32F031K6Tx'},
61-
'NUCLEO_F042K6': {'name': 'NUCLEO-F042K6', 'mcuId': 'STM32F042K6Tx'},
62-
'NUCLEO_F303K8': {'name': 'NUCLEO-F303K8', 'mcuId': 'STM32F303K8Tx'},
63-
'NUCLEO_F410RB': {'name': 'NUCLEO-F410RB', 'mcuId': 'STM32F410RBTx'},
30+
'B96B_F446VE': {'name': 'B96B-F446VE', 'mcuId': 'STM32F446VETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
31+
'DISCO_F051R8': {'name': 'STM32F0DISCOVERY', 'mcuId': 'STM32F051R8Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
32+
'DISCO_F303VC': {'name': 'STM32F3DISCOVERY', 'mcuId': 'STM32F303VCTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
33+
'DISCO_F334C8': {'name': 'STM32F3348DISCOVERY', 'mcuId': 'STM32F334C8Tx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
34+
'DISCO_F401VC': {'name': 'STM32F401C-DISCO', 'mcuId': 'STM32F401VCTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
35+
'DISCO_F407VG': {'name': 'STM32F4DISCOVERY', 'mcuId': 'STM32F407VGTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
36+
'DISCO_F429ZI': {'name': 'STM32F429I-DISCO', 'mcuId': 'STM32F429ZITx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
37+
'DISCO_F469NI': {'name': 'DISCO-F469NI', 'mcuId': 'STM32F469NIHx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
38+
'DISCO_F746NG': {'name': 'STM32F746G-DISCO', 'mcuId': 'STM32F746NGHx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
39+
'DISCO_F769NI': {'name': 'DISCO-F769NI', 'mcuId': 'STM32F769NIHx', 'fp_hardware': 'fpv5-d16', 'fp_abi': 'softfp'},
40+
'DISCO_L053C8': {'name': 'STM32L0538DISCOVERY', 'mcuId': 'STM32L053C8Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
41+
'DISCO_L476VG': {'name': 'STM32L476G-DISCO', 'mcuId': 'STM32L476VGTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
42+
'NUCLEO_F030R8': {'name': 'NUCLEO-F030R8', 'mcuId': 'STM32F030R8Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
43+
'NUCLEO_F031K6': {'name': 'NUCLEO-F031K6', 'mcuId': 'STM32F031K6Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
44+
'NUCLEO_F042K6': {'name': 'NUCLEO-F042K6', 'mcuId': 'STM32F042K6Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
45+
'NUCLEO_F070RB': {'name': 'NUCLEO-F070RB', 'mcuId': 'STM32F070RBTx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
46+
'NUCLEO_F072RB': {'name': 'NUCLEO-F072RB', 'mcuId': 'STM32F072RBTx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
47+
'NUCLEO_F091RC': {'name': 'NUCLEO-F091RC', 'mcuId': 'STM32F091RCTx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
48+
'NUCLEO_F103RB': {'name': 'NUCLEO-F103RB', 'mcuId': 'STM32F103RBTx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
49+
'NUCLEO_F207ZG': {'name': 'NUCLEO-F207ZG', 'mcuId': 'STM32F207ZGTx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
50+
'NUCLEO_F302R8': {'name': 'NUCLEO-F302R8', 'mcuId': 'STM32F302R8Tx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
51+
'NUCLEO_F303K8': {'name': 'NUCLEO-F303K8', 'mcuId': 'STM32F303K8Tx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
52+
'NUCLEO_F303RE': {'name': 'NUCLEO-F303RE', 'mcuId': 'STM32F303RETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
53+
'NUCLEO_F303ZE': {'name': 'NUCLEO-F303ZE', 'mcuId': 'STM32F303ZETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
54+
'NUCLEO_F334R8': {'name': 'NUCLEO-F334R8', 'mcuId': 'STM32F334R8Tx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
55+
'NUCLEO_F401RE': {'name': 'NUCLEO-F401RE', 'mcuId': 'STM32F401RETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
56+
'NUCLEO_F410RB': {'name': 'NUCLEO-F410RB', 'mcuId': 'STM32F410RBTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
57+
'NUCLEO_F411RE': {'name': 'NUCLEO-F411RE', 'mcuId': 'STM32F411RETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
58+
'NUCLEO_F429ZI': {'name': 'NUCLEO-F429ZI', 'mcuId': 'STM32F429ZITx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
59+
'NUCLEO_F446RE': {'name': 'NUCLEO-F446RE', 'mcuId': 'STM32F446RETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
60+
'NUCLEO_F446ZE': {'name': 'NUCLEO-F446ZE', 'mcuId': 'STM32F446ZETx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
61+
'NUCLEO_F746ZG': {'name': 'NUCLEO-F746ZG', 'mcuId': 'STM32F746ZGTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
62+
'NUCLEO_F767ZI': {'name': 'NUCLEO-F767ZI', 'mcuId': 'STM32F767ZITx', 'fp_hardware': 'fpv5-d16', 'fp_abi': 'softfp'},
63+
'NUCLEO_L011K4': {'name': 'NUCLEO-L011K4', 'mcuId': 'STM32L011K4Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
64+
'NUCLEO_L031K6': {'name': 'NUCLEO-L031K6', 'mcuId': 'STM32L031K6Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
65+
'NUCLEO_L053R8': {'name': 'NUCLEO-L053R8', 'mcuId': 'STM32L053R8Tx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
66+
'NUCLEO_L073RZ': {'name': 'NUCLEO-L073RZ', 'mcuId': 'STM32L073RZTx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
67+
'NUCLEO_L152RE': {'name': 'NUCLEO-L152RE', 'mcuId': 'STM32L152RETx', 'fp_hardware': 'no', 'fp_abi': 'soft' },
68+
'NUCLEO_L432KC': {'name': 'NUCLEO-L432KC', 'mcuId': 'STM32L432KCUx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
69+
'NUCLEO_L476RG': {'name': 'NUCLEO-L476RG', 'mcuId': 'STM32L476RGTx', 'fp_hardware': 'fpv4-sp-d16', 'fp_abi': 'softfp'},
6470
}
6571

6672
TARGETS = BOARDS.keys()
@@ -94,7 +100,9 @@ def generate(self):
94100
'release_config_uid': self.__generate_uid(),
95101
'release_tool_compiler_uid': self.__generate_uid(),
96102
'release_tool_compiler_input_uid': self.__generate_uid(),
97-
'uid': self.__generate_uid()
103+
'uid': self.__generate_uid(),
104+
'floating_point_hardware': self.BOARDS[self.target.upper()]['fp_hardware'],
105+
'floating_point_abi': self.BOARDS[self.target.upper()]['fp_abi']
98106
}
99107

100108
self.__gen_dir('.settings')

‎tools/export/sw4stm32_cproject_common.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<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">
2020
<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"/>
2121
<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"/>
22+
<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"/>
23+
<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"/>
2224
<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"/>
2325
<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"/>
2426
<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">

0 commit comments

Comments
 (0)