diff options
Diffstat (limited to 'examples/baremetal/stm32f4discovery')
| -rw-r--r-- | examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs | 23 | ||||
| -rw-r--r-- | examples/baremetal/stm32f4discovery/stm32f4discovery.qbs | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs index 5ccf8b3b0..f2e1dfcc9 100644 --- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs +++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs @@ -48,15 +48,14 @@ ** ****************************************************************************/ -import qbs - CppApplication { condition: { - if (!qbs.architecture.contains("arm")) + if (!qbs.architecture.startsWith("arm")) return false; - return qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("iar") - || qbs.toolchain.contains("keil") + return (qbs.toolchain.contains("gcc") + || qbs.toolchain.contains("iar") + || qbs.toolchain.contains("keil")) + && !qbs.toolchain.contains("xcode") } name: "stm32f4discovery-blueblink" cpp.cLanguageVersion: "c99" @@ -68,6 +67,11 @@ CppApplication { Properties { condition: qbs.toolchain.contains("gcc") + cpp.assemblerFlags: [ + "-mcpu=cortex-m4", + "-mfloat-abi=hard", + "-mfpu=fpv4-sp-d16", + ] cpp.driverFlags: [ "-mcpu=cortex-m4", "-mfloat-abi=hard", @@ -98,6 +102,10 @@ CppApplication { Properties { condition: qbs.toolchain.contains("iar") + cpp.assemblerFlags: [ + "--cpu", "cortex-m4", + "--fpu", "vfpv4_sp" + ] cpp.driverFlags: [ "--cpu", "cortex-m4", "--fpu", "vfpv4_sp" @@ -126,6 +134,9 @@ CppApplication { Properties { condition: qbs.toolchain.contains("keil") + cpp.assemblerFlags: [ + "--cpu", "cortex-m4.fp" + ] cpp.driverFlags: [ "--cpu", "cortex-m4.fp" ] diff --git a/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs b/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs index a402848ca..cbb3bdc3a 100644 --- a/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs +++ b/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs @@ -48,8 +48,6 @@ ** ****************************************************************************/ -import qbs - Project { name: "Examples for stm32f4discovery board" references: [ |