Skip to content

Commit a4b8f88

Browse files
author
Owen
authored
Merge pull request #267 from sparkfun/candidate-2.0.1
2 parents d63dc00 + 0f541ac commit a4b8f88

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

Diff for: ‎boards.txt

+20-12
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ menu.asb_baud=Ambiq Secure Bootloader Baud Rate
99
###############################################################
1010

1111
sfe_artemis_dk.name=Artemis Dev Kit
12+
sfe_artemis_dk.build.core=arduino
1213
sfe_artemis_dk.build.variant=SFE_ARTEMIS_DK
1314
sfe_artemis_dk.build.arch=APOLLO3
1415
sfe_artemis_dk.build.board=APOLLO3_SFE_ARTEMIS_DK
@@ -22,6 +23,7 @@ sfe_artemis_dk.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000
2223
###############################################################
2324

2425
sfe_artemis.name=RedBoard Artemis
26+
sfe_artemis.build.core=arduino
2527
sfe_artemis.build.variant=SFE_ARTEMIS
2628
sfe_artemis.build.arch=APOLLO3
2729
sfe_artemis.build.board=APOLLO3_SFE_ARTEMIS
@@ -35,8 +37,8 @@ sfe_artemis.menu.svl_baud.460800=460800
3537
sfe_artemis.menu.svl_baud.230400=230400
3638
sfe_artemis.menu.svl_baud.115200=115200
3739
sfe_artemis.menu.svl_baud.57600=57600
38-
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
39-
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
40+
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
41+
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
4042

4143
sfe_artemis.menu.svl_baud.57600.upload.svl_baud=57600
4244
sfe_artemis.menu.svl_baud.115200.upload.svl_baud=115200
@@ -55,6 +57,7 @@ sfe_artemis.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/
5557
###############################################################
5658

5759
sfe_artemis_atp.name=RedBoard Artemis ATP
60+
sfe_artemis_atp.build.core=arduino
5861
sfe_artemis_atp.build.variant=SFE_ARTEMIS_ATP
5962
sfe_artemis_atp.build.arch=APOLLO3
6063
sfe_artemis_atp.build.board=APOLLO3_SFE_ARTEMIS_ATP
@@ -68,8 +71,8 @@ sfe_artemis_atp.menu.svl_baud.460800=460800
6871
sfe_artemis_atp.menu.svl_baud.230400=230400
6972
sfe_artemis_atp.menu.svl_baud.115200=115200
7073
sfe_artemis_atp.menu.svl_baud.57600=57600
71-
sfe_artemis_atp.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
72-
sfe_artemis_atp.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
74+
sfe_artemis_atp.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
75+
sfe_artemis_atp.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
7376

7477
sfe_artemis_atp.menu.svl_baud.57600.upload.svl_baud=57600
7578
sfe_artemis_atp.menu.svl_baud.115200.upload.svl_baud=115200
@@ -88,6 +91,7 @@ sfe_artemis_atp.menu.loader.option_svl.build.ldscript={runtime.platform.path}/to
8891
###############################################################
8992

9093
sfe_artemis_nano.name=RedBoard Artemis Nano
94+
sfe_artemis_nano.build.core=arduino
9195
sfe_artemis_nano.build.variant=SFE_ARTEMIS_NANO
9296
sfe_artemis_nano.build.arch=APOLLO3
9397
sfe_artemis_nano.build.board=APOLLO3_SFE_ARTEMIS_NANO
@@ -101,8 +105,8 @@ sfe_artemis_nano.menu.svl_baud.460800=460800
101105
sfe_artemis_nano.menu.svl_baud.230400=230400
102106
sfe_artemis_nano.menu.svl_baud.115200=115200
103107
sfe_artemis_nano.menu.svl_baud.57600=57600
104-
sfe_artemis_nano.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
105-
sfe_artemis_nano.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
108+
sfe_artemis_nano.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
109+
sfe_artemis_nano.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
106110

107111
sfe_artemis_nano.menu.svl_baud.57600.upload.svl_baud=57600
108112
sfe_artemis_nano.menu.svl_baud.115200.upload.svl_baud=115200
@@ -121,6 +125,7 @@ sfe_artemis_nano.menu.loader.option_svl.build.ldscript={runtime.platform.path}/t
121125
###############################################################
122126

123127
sfe_artemis_thing_plus.name=Artemis Thing Plus
128+
sfe_artemis_thing_plus.build.core=arduino
124129
sfe_artemis_thing_plus.build.variant=SFE_ARTEMIS_THING_PLUS
125130
sfe_artemis_thing_plus.build.arch=APOLLO3
126131
sfe_artemis_thing_plus.build.board=APOLLO3_SFE_ARTEMIS_THING_PLUS
@@ -134,8 +139,8 @@ sfe_artemis_thing_plus.menu.svl_baud.460800=460800
134139
sfe_artemis_thing_plus.menu.svl_baud.230400=230400
135140
sfe_artemis_thing_plus.menu.svl_baud.115200=115200
136141
sfe_artemis_thing_plus.menu.svl_baud.57600=57600
137-
sfe_artemis_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
138-
sfe_artemis_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
142+
sfe_artemis_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
143+
sfe_artemis_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
139144

140145
sfe_artemis_thing_plus.menu.svl_baud.57600.upload.svl_baud=57600
141146
sfe_artemis_thing_plus.menu.svl_baud.115200.upload.svl_baud=115200
@@ -154,6 +159,7 @@ sfe_artemis_thing_plus.menu.loader.option_svl.build.ldscript={runtime.platform.p
154159
###############################################################
155160

156161
sfe_edge.name=Edge
162+
sfe_edge.build.core=arduino
157163
sfe_edge.build.variant=SFE_EDGE
158164
sfe_edge.build.arch=APOLLO3
159165
sfe_edge.build.board=APOLLO3_SFE_EDGE
@@ -192,6 +198,7 @@ sfe_edge.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/upl
192198
###############################################################
193199

194200
sfe_edge2.name=Edge2
201+
sfe_edge2.build.core=arduino
195202
sfe_edge2.build.variant=SFE_EDGE2
196203
sfe_edge2.build.arch=APOLLO3
197204
sfe_edge2.build.board=APOLLO3_SFE_EDGE2
@@ -205,8 +212,8 @@ sfe_edge2.menu.svl_baud.460800=460800
205212
sfe_edge2.menu.svl_baud.230400=230400
206213
sfe_edge2.menu.svl_baud.115200=115200
207214
sfe_edge2.menu.svl_baud.57600=57600
208-
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
209-
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
215+
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
216+
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
210217

211218
sfe_edge2.menu.svl_baud.57600.upload.svl_baud=57600
212219
sfe_edge2.menu.svl_baud.115200.upload.svl_baud=115200
@@ -225,6 +232,7 @@ sfe_edge2.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/up
225232
###############################################################
226233

227234
sfe_artemis_module.name=Artemis Module
235+
sfe_artemis_module.build.core=arduino
228236
sfe_artemis_module.build.variant=SFE_ARTEMIS_MODULE
229237
sfe_artemis_module.build.arch=APOLLO3
230238
sfe_artemis_module.build.board=APOLLO3_SFE_ARTEMIS_MODULE
@@ -238,8 +246,8 @@ sfe_artemis_module.menu.svl_baud.460800=460800
238246
sfe_artemis_module.menu.svl_baud.230400=230400
239247
sfe_artemis_module.menu.svl_baud.115200=115200
240248
sfe_artemis_module.menu.svl_baud.57600=57600
241-
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
242-
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
249+
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
250+
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
243251

244252
sfe_artemis_module.menu.svl_baud.57600.upload.svl_baud=57600
245253
sfe_artemis_module.menu.svl_baud.115200.upload.svl_baud=115200

Diff for: ‎platform.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defines.cxx={defines.all} @{build.variant.path}/mbed/.cxx-symbols
2121
defines.ld={defines.all} @{build.variant.path}/mbed/.ld-symbols
2222

2323
# includes
24-
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api" -include {cores.path}/arduino/sdk/ArduinoSDK.h
24+
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api"
2525
includes.mbed=@{build.variant.path}/mbed/.includes
2626
includes.variant={build.includes}
2727
includes.extra=
@@ -44,8 +44,8 @@ compiler.warning_flags.all={compiler.warning_flags.default} -Wextra
4444
# flags
4545
compiler.preproc.flags={compiler.cxx.flags} -w -x c++ -E -CC {compiler.preproc.extra_flags}
4646
compiler.asm.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.asm-flags {compiler.asm.extra_flags}
47-
compiler.c.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.c-flags {compiler.c.extra_flags}
48-
compiler.cxx.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.cxx-flags {compiler.cxx.extra_flags}
47+
compiler.c.flags=-iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.c-flags {compiler.c.extra_flags}
48+
compiler.cxx.flags=-include {build.variant.path}/mbed/mbed_config.h -include {cores.path}/arduino/sdk/ArduinoSDK.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.cxx-flags {compiler.cxx.extra_flags}
4949
compiler.ld.flags=@{build.variant.path}/mbed/.ld-flags {compiler.ld.extra_flags} --specs=nano.specs -lsupc++ -lstdc++ -lm
5050
compiler.ar.flags=rcsP {compiler.ar.extra_flags} {compiler.ar.extra_flags}
5151
compiler.axf2bin.flags={compiler.axf2bin.extra_flags} {compiler.axf2bin.extra_flags} -O binary

0 commit comments

Comments
 (0)