Skip to content

Commit 200b3aa

Browse files
hathachhathach
authored
Merge pull request #263 from adafruit/develop
Update bootloader binaries to 0.2.11 for metro nrf52840 support
2 parents 4468594 + 25cf50b commit 200b3aa

File tree

68 files changed

+7044
-7184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+7044
-7184
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ git:
1111
before_install:
1212
# - source <(curl -SLs https://raw.githubusercontent.com/hathach/travis-ci-arduino/test-nrf52/install.sh)
1313
script:
14+
- echo "test travis"
1415
# - build_platform adafruit:nrf52:feather52840
1516

1617
notifications:

‎boards.txt‎

Lines changed: 68 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
# License along with this library; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818

19-
menu.softdevice=Bootloader Version
20-
menu.debug=Debug Mode
19+
menu.softdevice=Bootloader
20+
menu.debug=Debug
2121

22-
#**********************************************
23-
# Bluefruit Feather nRF52832 Board
24-
#**********************************************
25-
feather52832.name=Adafruit Bluefruit nRF52832 Feather
22+
# ----------------------------------
23+
# Bluefruit Feather nRF52832
24+
# ----------------------------------
25+
feather52832.name=Adafruit Bluefruit Feather nRF52832
2626
feather52832.bootloader.tool=bootburn
2727

2828
# Upload
@@ -31,6 +31,8 @@ feather52832.upload.protocol=nrfutil
3131
feather52832.upload.use_1200bps_touch=false
3232
feather52832.upload.wait_for_upload_port=false
3333
feather52832.upload.native_usb=false
34+
feather52832.upload.maximum_size=290816
35+
feather52832.upload.maximum_data_size=51072
3436

3537
# Build
3638
feather52832.build.mcu=cortex-m4
@@ -39,185 +41,163 @@ feather52832.build.board=NRF52832_FEATHER
3941
feather52832.build.core=nRF5
4042
feather52832.build.variant=feather_nrf52832
4143
feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52 -DARDUINO_NRF52_FEATHER
44+
feather52832.build.ldscript=nrf52832_s132_v6.ld
4245

4346
# SofDevice Menu
44-
# Ram & ROM size varies depending on SoftDevice (check linker script)
45-
46-
feather52832.menu.softdevice.s132v6=0.2.9 (s132 6.1.1)
47-
feather52832.menu.softdevice.s132v6.build.sd_flags=-DS132
47+
feather52832.menu.softdevice.s132v6=0.2.11 SoftDevice s132 6.1.1
4848
feather52832.menu.softdevice.s132v6.build.sd_name=s132
4949
feather52832.menu.softdevice.s132v6.build.sd_version=6.1.1
5050
feather52832.menu.softdevice.s132v6.build.sd_fwid=0x00B7
51-
feather52832.menu.softdevice.s132v6.build.ldscript=nrf52832_s132_v6.ld
52-
feather52832.menu.softdevice.s132v6.upload.maximum_size=290816
53-
feather52832.menu.softdevice.s132v6.upload.maximum_data_size=51072
5451

5552
# Debug Menu
5653
feather52832.menu.debug.l0=Level 0 (Release)
57-
feather52832.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
54+
feather52832.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
5855
feather52832.menu.debug.l1=Level 1 (Error Message)
59-
feather52832.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
56+
feather52832.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
6057
feather52832.menu.debug.l2=Level 2 (Full Debug)
61-
feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
58+
feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
6259
feather52832.menu.debug.l3=Level 3 (Segger SystemView)
63-
feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
64-
60+
feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
6561

66-
#**********************************************
67-
# Bluefruit Feather nRF52840 Express Board
68-
#**********************************************
69-
feather52840.name=Adafruit Bluefruit nRF52840 Feather Express
62+
# ----------------------------------
63+
# Bluefruit Feather nRF52840 Express
64+
# ----------------------------------
65+
feather52840.name=Adafruit Bluefruit Feather nRF52840 Express
7066

71-
# DFU Mode with CDC + MSC (UF2)
67+
# VID/PID for bootloader with/without UF2, Arduino + Circuitpython App
7268
feather52840.vid.0=0x239A
73-
feather52840.pid.0=0x0029
74-
75-
# DFU Mode with CDC only
69+
feather52840.pid.0=0x8029
7670
feather52840.vid.1=0x239A
77-
feather52840.pid.1=0x002A
78-
79-
# Arduino Application
71+
feather52840.pid.1=0x0029
8072
feather52840.vid.2=0x239A
81-
feather52840.pid.2=0x8029
82-
83-
# CircuitPython
73+
feather52840.pid.2=0x002A
8474
feather52840.vid.3=0x239A
8575
feather52840.pid.3=0x802A
8676

87-
feather52840.bootloader.tool=bootburn
88-
8977
# Upload
78+
feather52840.bootloader.tool=bootburn
9079
feather52840.upload.tool=nrfutil
9180
feather52840.upload.protocol=nrfutil
9281
feather52840.upload.use_1200bps_touch=true
9382
feather52840.upload.wait_for_upload_port=true
83+
feather52840.upload.maximum_size=815104
84+
feather52840.upload.maximum_data_size=248832
9485

9586
# Build
9687
feather52840.build.mcu=cortex-m4
9788
feather52840.build.f_cpu=64000000
9889
feather52840.build.board=NRF52840_FEATHER
9990
feather52840.build.core=nRF5
10091
feather52840.build.variant=feather_nrf52840_express
101-
feather52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER
92+
feather52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER {build.flags.usb}
93+
feather52840.build.ldscript=nrf52840_s140_v6.ld
94+
feather52840.build.vid=0x239A
95+
feather52840.build.pid=0x8029
10296

10397
# SofDevice Menu
104-
# Ram & ROM size varies depending on SoftDevice (check linker script)
105-
106-
feather52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
107-
feather52840.menu.softdevice.s140v6.build.sd_flags=-DS140
98+
feather52840.menu.softdevice.s140v6=0.2.11 SoftDevice s140 6.1.1
10899
feather52840.menu.softdevice.s140v6.build.sd_name=s140
109100
feather52840.menu.softdevice.s140v6.build.sd_version=6.1.1
110101
feather52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
111-
feather52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
112-
feather52840.menu.softdevice.s140v6.upload.maximum_size=815104
113-
feather52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
114102

115103
# Debug Menu
116104
feather52840.menu.debug.l0=Level 0 (Release)
117-
feather52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
105+
feather52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
118106
feather52840.menu.debug.l1=Level 1 (Error Message)
119-
feather52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
107+
feather52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
120108
feather52840.menu.debug.l2=Level 2 (Full Debug)
121-
feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
109+
feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
122110
feather52840.menu.debug.l3=Level 3 (Segger SystemView)
123-
feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
111+
feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
124112

125-
#**********************************************
126-
# Bluefruit Metro nRF52840 Express Board
127-
#**********************************************
128-
metro52840.name=Adafruit Bluefruit nRF52840 Metro Express
129-
metro52840.bootloader.tool=bootburn
113+
# ----------------------------------
114+
# Bluefruit Metro nRF52840 Express
115+
# ----------------------------------
116+
metro52840.name=Adafruit Bluefruit Metro nRF52840 Express
130117

131-
# DFU Mode with CDC + MSC (UF2)
118+
# VID/PID for bootloader with/without UF2, Arduino + Circuitpython App
132119
metro52840.vid.0=0x239A
133-
metro52840.pid.0=0x003F
134-
135-
# DFU Mode with CDC only
120+
metro52840.pid.0=0x803F
136121
metro52840.vid.1=0x239A
137-
metro52840.pid.1=0x0040
138-
139-
# Arduino Application
122+
metro52840.pid.1=0x003F
140123
metro52840.vid.2=0x239A
141-
metro52840.pid.2=0x803F
142-
143-
# CircuitPython
124+
metro52840.pid.2=0x0040
144125
metro52840.vid.3=0x239A
145126
metro52840.pid.3=0x8040
146127

147128
# Upload
129+
metro52840.bootloader.tool=bootburn
148130
metro52840.upload.tool=nrfutil
149131
metro52840.upload.protocol=nrfutil
150132
metro52840.upload.use_1200bps_touch=true
151133
metro52840.upload.wait_for_upload_port=true
134+
metro52840.upload.maximum_size=815104
135+
metro52840.upload.maximum_data_size=248832
152136

153137
# Build
154138
metro52840.build.mcu=cortex-m4
155139
metro52840.build.f_cpu=64000000
156140
metro52840.build.board=NRF52840_METRO
157141
metro52840.build.core=nRF5
158142
metro52840.build.variant=metro_nrf52840_express
159-
metro52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER
143+
metro52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER {build.flags.usb}
144+
metro52840.build.ldscript=nrf52840_s140_v6.ld
145+
metro52840.build.vid=0x239A
146+
metro52840.build.pid=0x803F
160147

161148
# SofDevice Menu
162-
# Ram & ROM size varies depending on SoftDevice (check linker script)
163-
164-
metro52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
165-
metro52840.menu.softdevice.s140v6.build.sd_flags=-DS140
149+
metro52840.menu.softdevice.s140v6=0.2.11 SoftDevice s140 6.1.1
166150
metro52840.menu.softdevice.s140v6.build.sd_name=s140
167151
metro52840.menu.softdevice.s140v6.build.sd_version=6.1.1
168152
metro52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
169-
metro52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
170-
metro52840.menu.softdevice.s140v6.upload.maximum_size=815104
171-
metro52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
172153

173154
# Debug Menu
174155
metro52840.menu.debug.l0=Level 0 (Release)
175-
metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
156+
metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
176157
metro52840.menu.debug.l1=Level 1 (Error Message)
177-
metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
158+
metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
178159
metro52840.menu.debug.l2=Level 2 (Full Debug)
179-
metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
160+
metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
180161
metro52840.menu.debug.l3=Level 3 (Segger SystemView)
181-
metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
162+
metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
182163

183-
#**********************************************
164+
# ----------------------------------
184165
# Nordic nRF52840DK (PCA10056)
185-
#**********************************************
186-
pca10056.name=Adafruit Bluefruit on nRF52840DK PCA10056
166+
# ----------------------------------
167+
pca10056.name=Noridc nRF52840DK (PCA10056)
187168
pca10056.bootloader.tool=bootburn
188169

189170
# Upload
190171
pca10056.upload.tool=nrfutil
191172
pca10056.upload.protocol=nrfutil
192173
pca10056.upload.use_1200bps_touch=true
193174
pca10056.upload.wait_for_upload_port=true
175+
pca10056.upload.maximum_size=815104
176+
pca10056.upload.maximum_data_size=248832
194177

195178
# Build
196179
pca10056.build.mcu=cortex-m4
197180
pca10056.build.f_cpu=64000000
198181
pca10056.build.board=NRF52840_PCA10056
199182
pca10056.build.core=nRF5
200183
pca10056.build.variant=pca10056
201-
pca10056.build.extra_flags=-DNRF52840_XXAA
184+
pca10056.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
185+
pca10056.build.ldscript=nrf52840_s140_v6.ld
186+
pca10056.build.vid=0x239A
187+
pca10056.build.pid=0x8029
202188

203189
# SofDevice Menu
204-
# Ram & ROM size varies depending on SoftDevice (check linker script)
205-
206-
pca10056.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
207-
pca10056.menu.softdevice.s140v6.build.sd_flags=-DS140
190+
pca10056.menu.softdevice.s140v6=0.2.11 SoftDevice s140 6.1.1
208191
pca10056.menu.softdevice.s140v6.build.sd_name=s140
209192
pca10056.menu.softdevice.s140v6.build.sd_version=6.1.1
210193
pca10056.menu.softdevice.s140v6.build.sd_fwid=0x00B6
211-
pca10056.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
212-
pca10056.menu.softdevice.s140v6.upload.maximum_size=815104
213-
pca10056.menu.softdevice.s140v6.upload.maximum_data_size=248832
214194

215195
# Debug Menu
216196
pca10056.menu.debug.l0=Level 0 (Release)
217-
pca10056.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
197+
pca10056.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
218198
pca10056.menu.debug.l1=Level 1 (Error Message)
219-
pca10056.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
199+
pca10056.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
220200
pca10056.menu.debug.l2=Level 2 (Full Debug)
221-
pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
201+
pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
222202
pca10056.menu.debug.l3=Level 3 (Segger SystemView)
223-
pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
203+
pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3

0 commit comments

Comments
 (0)