Skip to content

Commit 366070d

Browse files
author
oclyke
committed
lots of variants work
1 parent 0cc21b5 commit 366070d

File tree

37 files changed

+928
-1508
lines changed

37 files changed

+928
-1508
lines changed

‎.github/workflows/generate-variants.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
with:
2424
jobs: |
2525
[
26+
{"name": "artemis-redboard-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS", "loc": "variants/SFE_ARTEMIS"}}},
2627
{"name": "artemis-redboard-atp-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS_ATP", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS_ATP", "loc": "variants/SFE_ARTEMIS_ATP"}}},
2728
{"name": "artemis-dev-kit-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS_DK", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS_DEV_KIT", "loc": "variants/SFE_ARTEMIS_DK"}}},
2829
{"name": "artemis-redboard-nano-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS_NANO", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS_NANO", "loc": "variants/SFE_ARTEMIS_NANO"}}},

‎boards.txt‎

Lines changed: 92 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,53 @@ menu.asb_baud=Ambiq Secure Bootloader Baud Rate
88

99
###############################################################
1010

11-
sfe_artemis_atp.name=SparkFun RedBoard Artemis ATP
11+
sfe_artemis_dk.name=Artemis Dev Kit
12+
sfe_artemis_dk.build.variant=SFE_ARTEMIS_DK
13+
sfe_artemis_dk.build.arch=APOLLO3
14+
sfe_artemis_dk.build.board=APOLLO3_SFE_ARTEMIS_DK
15+
sfe_artemis_dk.build.export_format=bin
16+
sfe_artemis_dk.build.defines=
17+
sfe_artemis_dk.build.includes=
18+
sfe_artemis_dk.build.libs=
19+
20+
sfe_artemis_dk.build.ldscript={build.variant.path}/0xC000.ld
21+
22+
###############################################################
23+
24+
sfe_artemis.name=RedBoard Artemis
25+
sfe_artemis.build.variant=SFE_ARTEMIS
26+
sfe_artemis.build.arch=APOLLO3
27+
sfe_artemis.build.board=APOLLO3_SFE_ARTEMIS
28+
sfe_artemis.build.export_format=bin
29+
sfe_artemis.build.defines=
30+
sfe_artemis.build.includes=
31+
sfe_artemis.build.libs=
32+
33+
sfe_artemis.menu.svl_baud.921600=921600
34+
sfe_artemis.menu.svl_baud.460800=460800
35+
sfe_artemis.menu.svl_baud.230400=230400
36+
sfe_artemis.menu.svl_baud.115200=115200
37+
sfe_artemis.menu.svl_baud.57600=57600
38+
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
39+
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
40+
41+
sfe_artemis.menu.svl_baud.57600.upload.svl_baud=57600
42+
sfe_artemis.menu.svl_baud.115200.upload.svl_baud=115200
43+
sfe_artemis.menu.svl_baud.230400.upload.svl_baud=230400
44+
sfe_artemis.menu.svl_baud.460800.upload.svl_baud=460800
45+
sfe_artemis.menu.svl_baud.921600.upload.svl_baud=921600
46+
47+
sfe_artemis.upload.asb_baud=115200
48+
49+
sfe_artemis.menu.loader.option_asb.upload.tool=asb
50+
sfe_artemis.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
51+
52+
sfe_artemis.menu.loader.option_svl.upload.tool=svl
53+
sfe_artemis.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
54+
55+
###############################################################
56+
57+
sfe_artemis_atp.name=RedBoard Artemis ATP
1258
sfe_artemis_atp.build.variant=SFE_ARTEMIS_ATP
1359
sfe_artemis_atp.build.arch=APOLLO3
1460
sfe_artemis_atp.build.board=APOLLO3_SFE_ARTEMIS_ATP
@@ -34,60 +80,14 @@ sfe_artemis_atp.menu.svl_baud.921600.upload.svl_baud=921600
3480
sfe_artemis_atp.upload.asb_baud=115200
3581

3682
sfe_artemis_atp.menu.loader.option_asb.upload.tool=asb
37-
sfe_artemis_atp.menu.loader.option_asb.build.ldscript={build.variant.path}/0xC000.ld
83+
sfe_artemis_atp.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
3884

3985
sfe_artemis_atp.menu.loader.option_svl.upload.tool=svl
40-
sfe_artemis_atp.menu.loader.option_svl.build.ldscript={build.variant.path}/0x10000.ld
86+
sfe_artemis_atp.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
4187

4288
###############################################################
4389

44-
sfe_artemis_dk.name=SparkFun RedBoard Artemis Dev Kit
45-
sfe_artemis_dk.build.variant=SFE_ARTEMIS_DK
46-
sfe_artemis_dk.build.arch=APOLLO3
47-
sfe_artemis_dk.build.board=APOLLO3_SFE_ARTEMIS_DK
48-
sfe_artemis_dk.build.export_format=bin
49-
sfe_artemis_dk.build.defines=
50-
sfe_artemis_dk.build.includes=
51-
sfe_artemis_dk.build.libs=
52-
53-
sfe_artemis_dk.build.ldscript={build.variant.path}/0xC000.ld
54-
55-
###############################################################
56-
57-
sfe_artemis_module.name=SparkFun Artemis Module
58-
sfe_artemis_module.build.variant=SFE_ARTEMIS_MODULE
59-
sfe_artemis_module.build.arch=APOLLO3
60-
sfe_artemis_module.build.board=APOLLO3_SFE_ARTEMIS_MODULE
61-
sfe_artemis_module.build.export_format=bin
62-
sfe_artemis_module.build.defines=
63-
sfe_artemis_module.build.includes=
64-
sfe_artemis_module.build.libs=
65-
66-
sfe_artemis_module.menu.svl_baud.921600=921600
67-
sfe_artemis_module.menu.svl_baud.460800=460800
68-
sfe_artemis_module.menu.svl_baud.230400=230400
69-
sfe_artemis_module.menu.svl_baud.115200=115200
70-
sfe_artemis_module.menu.svl_baud.57600=57600
71-
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
72-
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
73-
74-
sfe_artemis_module.menu.svl_baud.57600.upload.svl_baud=57600
75-
sfe_artemis_module.menu.svl_baud.115200.upload.svl_baud=115200
76-
sfe_artemis_module.menu.svl_baud.230400.upload.svl_baud=230400
77-
sfe_artemis_module.menu.svl_baud.460800.upload.svl_baud=460800
78-
sfe_artemis_module.menu.svl_baud.921600.upload.svl_baud=921600
79-
80-
sfe_artemis_module.upload.asb_baud=115200
81-
82-
sfe_artemis_module.menu.loader.option_asb.upload.tool=asb
83-
sfe_artemis_module.menu.loader.option_asb.build.ldscript={build.variant.path}/0xC000.ld
84-
85-
sfe_artemis_module.menu.loader.option_svl.upload.tool=svl
86-
sfe_artemis_module.menu.loader.option_svl.build.ldscript={build.variant.path}/0x10000.ld
87-
88-
###############################################################
89-
90-
sfe_artemis_nano.name=SparkFun RedBoard Artemis Nano
90+
sfe_artemis_nano.name=RedBoard Artemis Nano
9191
sfe_artemis_nano.build.variant=SFE_ARTEMIS_NANO
9292
sfe_artemis_nano.build.arch=APOLLO3
9393
sfe_artemis_nano.build.board=APOLLO3_SFE_ARTEMIS_NANO
@@ -113,14 +113,14 @@ sfe_artemis_nano.menu.svl_baud.921600.upload.svl_baud=921600
113113
sfe_artemis_nano.upload.asb_baud=115200
114114

115115
sfe_artemis_nano.menu.loader.option_asb.upload.tool=asb
116-
sfe_artemis_nano.menu.loader.option_asb.build.ldscript={build.variant.path}/0xC000.ld
116+
sfe_artemis_nano.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
117117

118118
sfe_artemis_nano.menu.loader.option_svl.upload.tool=svl
119-
sfe_artemis_nano.menu.loader.option_svl.build.ldscript={build.variant.path}/0x10000.ld
119+
sfe_artemis_nano.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
120120

121121
###############################################################
122122

123-
sfe_artemis_thing_plus.name=SparkFun Artemis Thing Plus
123+
sfe_artemis_thing_plus.name=Artemis Thing Plus
124124
sfe_artemis_thing_plus.build.variant=SFE_ARTEMIS_THING_PLUS
125125
sfe_artemis_thing_plus.build.arch=APOLLO3
126126
sfe_artemis_thing_plus.build.board=APOLLO3_SFE_ARTEMIS_THING_PLUS
@@ -146,14 +146,14 @@ sfe_artemis_thing_plus.menu.svl_baud.921600.upload.svl_baud=921600
146146
sfe_artemis_thing_plus.upload.asb_baud=115200
147147

148148
sfe_artemis_thing_plus.menu.loader.option_asb.upload.tool=asb
149-
sfe_artemis_thing_plus.menu.loader.option_asb.build.ldscript={build.variant.path}/0xC000.ld
149+
sfe_artemis_thing_plus.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
150150

151151
sfe_artemis_thing_plus.menu.loader.option_svl.upload.tool=svl
152-
sfe_artemis_thing_plus.menu.loader.option_svl.build.ldscript={build.variant.path}/0x10000.ld
152+
sfe_artemis_thing_plus.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
153153

154154
###############################################################
155155

156-
sfe_edge.name=SparkFun Edge
156+
sfe_edge.name=Edge
157157
sfe_edge.build.variant=SFE_EDGE
158158
sfe_edge.build.arch=APOLLO3
159159
sfe_edge.build.board=APOLLO3_SFE_EDGE
@@ -184,14 +184,14 @@ sfe_edge.menu.asb_baud.115200.upload.asb_baud=115200
184184
sfe_edge.menu.asb_baud.921600.upload.asb_baud=921600
185185

186186
sfe_edge.menu.loader.option_asb.upload.tool=asb
187-
sfe_edge.menu.loader.option_asb.build.ldscript={build.variant.path}/0xC000.ld
187+
sfe_edge.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
188188

189189
sfe_edge.menu.loader.option_svl.upload.tool=svl
190-
sfe_edge.menu.loader.option_svl.build.ldscript={build.variant.path}/0x10000.ld
190+
sfe_edge.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
191191

192192
###############################################################
193193

194-
sfe_edge2.name=SparkFun Edge2
194+
sfe_edge2.name=Edge2
195195
sfe_edge2.build.variant=SFE_EDGE2
196196
sfe_edge2.build.arch=APOLLO3
197197
sfe_edge2.build.board=APOLLO3_SFE_EDGE2
@@ -217,9 +217,40 @@ sfe_edge2.menu.svl_baud.921600.upload.svl_baud=921600
217217
sfe_edge2.upload.asb_baud=115200
218218

219219
sfe_edge2.menu.loader.option_asb.upload.tool=asb
220-
sfe_edge2.menu.loader.option_asb.build.ldscript={build.variant.path}/0xC000.ld
220+
sfe_edge2.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
221221

222222
sfe_edge2.menu.loader.option_svl.upload.tool=svl
223-
sfe_edge2.menu.loader.option_svl.build.ldscript={build.variant.path}/0x10000.ld
223+
sfe_edge2.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
224224

225225
###############################################################
226+
227+
sfe_artemis_module.name=Artemis Module
228+
sfe_artemis_module.build.variant=SFE_ARTEMIS_MODULE
229+
sfe_artemis_module.build.arch=APOLLO3
230+
sfe_artemis_module.build.board=APOLLO3_SFE_ARTEMIS_MODULE
231+
sfe_artemis_module.build.export_format=bin
232+
sfe_artemis_module.build.defines=
233+
sfe_artemis_module.build.includes=
234+
sfe_artemis_module.build.libs=
235+
236+
sfe_artemis_module.menu.svl_baud.921600=921600
237+
sfe_artemis_module.menu.svl_baud.460800=460800
238+
sfe_artemis_module.menu.svl_baud.230400=230400
239+
sfe_artemis_module.menu.svl_baud.115200=115200
240+
sfe_artemis_module.menu.svl_baud.57600=57600
241+
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
242+
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
243+
244+
sfe_artemis_module.menu.svl_baud.57600.upload.svl_baud=57600
245+
sfe_artemis_module.menu.svl_baud.115200.upload.svl_baud=115200
246+
sfe_artemis_module.menu.svl_baud.230400.upload.svl_baud=230400
247+
sfe_artemis_module.menu.svl_baud.460800.upload.svl_baud=460800
248+
sfe_artemis_module.menu.svl_baud.921600.upload.svl_baud=921600
249+
250+
sfe_artemis_module.upload.asb_baud=115200
251+
252+
sfe_artemis_module.menu.loader.option_asb.upload.tool=asb
253+
sfe_artemis_module.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
254+
255+
sfe_artemis_module.menu.loader.option_svl.upload.tool=svl
256+
sfe_artemis_module.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld

‎variants/SFE_ARTEMIS/config/pins.cpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
// This file is subject to the terms and conditions defined in
3+
// file 'LICENSE.md', which is part of this source code package.
4+
*/
5+
6+
#include "bridge/pins.h"
7+
8+
const pin_size_t variantPinCount = 17;
9+
10+
PinState variantPinStates[variantPinCount] = {
11+
{D0, 0, NULL, /*NULL, NULL, NULL,*/ NULL},
12+
{D1, 1, NULL, /*NULL, NULL, NULL,*/ NULL},
13+
{D2, 2, NULL, /*NULL, NULL, NULL,*/ NULL},
14+
{D3, 3, NULL, /*NULL, NULL, NULL,*/ NULL},
15+
{D4, 4, NULL, /*NULL, NULL, NULL,*/ NULL},
16+
{D5, 5, NULL, /*NULL, NULL, NULL,*/ NULL},
17+
{D6, 6, NULL, /*NULL, NULL, NULL,*/ NULL},
18+
{D7, 7, NULL, /*NULL, NULL, NULL,*/ NULL},
19+
{D8, 8, NULL, /*NULL, NULL, NULL,*/ NULL},
20+
{D9, 9, NULL, /*NULL, NULL, NULL,*/ NULL},
21+
{D10, 10, NULL, /*NULL, NULL, NULL,*/ NULL},
22+
{D11, 11, NULL, /*NULL, NULL, NULL,*/ NULL},
23+
{D12, 12, NULL, /*NULL, NULL, NULL,*/ NULL},
24+
{D13, 13, NULL, /*NULL, NULL, NULL,*/ NULL},
25+
{D14, 14, NULL, /*NULL, NULL, NULL,*/ NULL},
26+
{D15, 15, NULL, /*NULL, NULL, NULL,*/ NULL},
27+
{D16, 16, NULL, /*NULL, NULL, NULL,*/ NULL},
28+
};

‎variants/SFE_ARTEMIS/config/pins.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
// This file is subject to the terms and conditions defined in
3+
// file 'LICENSE.md', which is part of this source code package.
4+
*/
5+
6+
#ifndef _VARIANT_PINS_H_
7+
#define _VARIANT_PINS_H_
8+
9+
#define LED_BUILTIN pinNumberByName(LED1)
10+
11+
#endif // _VARIANT_PINS_H_

‎variants/SFE_ARTEMIS/mbed/.asm-flags‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-c -x assembler-with-cpp

‎variants/SFE_ARTEMIS/mbed/.asm-macros‎

Whitespace-only changes.

‎variants/SFE_ARTEMIS/mbed/.asm-symbols‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM

‎variants/SFE_ARTEMIS/mbed/.c-flags‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-c -std=gnu11 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -MMD -Os -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb

‎variants/SFE_ARTEMIS/mbed/.c-macros‎

Whitespace-only changes.

‎variants/SFE_ARTEMIS/mbed/.c-symbols‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_ATP -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_ATP -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1

0 commit comments

Comments
 (0)