Skip to content

Commit a9e109d

Browse files
committed
Prevent double-definition on compilation
Boards.txt should have updated multiple settings debug level of 3, not attempted to stuff multiple settings into the same variable.
1 parent 20b080f commit a9e109d

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

boards.txt

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ feather52832.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
5959
feather52832.menu.debug.l2=Level 2 (Full Debug)
6060
feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
6161
feather52832.menu.debug.l3=Level 3 (Segger SystemView)
62-
feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
62+
feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
63+
feather52832.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
6364

6465
# ----------------------------------
6566
# Bluefruit Feather nRF52840 Express
@@ -112,7 +113,8 @@ feather52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
112113
feather52840.menu.debug.l2=Level 2 (Full Debug)
113114
feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
114115
feather52840.menu.debug.l3=Level 3 (Segger SystemView)
115-
feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
116+
feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
117+
feather52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
116118

117119

118120
# ----------------------------------
@@ -166,7 +168,8 @@ feather52840sense.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
166168
feather52840sense.menu.debug.l2=Level 2 (Full Debug)
167169
feather52840sense.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
168170
feather52840sense.menu.debug.l3=Level 3 (Segger SystemView)
169-
feather52840sense.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
171+
feather52840sense.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
172+
feather52840sense.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
170173

171174

172175
# ---------------------------------------------
@@ -220,7 +223,8 @@ itsybitsy52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
220223
itsybitsy52840.menu.debug.l2=Level 2 (Full Debug)
221224
itsybitsy52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
222225
itsybitsy52840.menu.debug.l3=Level 3 (Segger SystemView)
223-
itsybitsy52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
226+
itsybitsy52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
227+
itsybitsy52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
224228

225229
# ---------------------------------------------
226230
# Bluefruit Circuit Playground nRF52840 Express
@@ -273,7 +277,8 @@ cplaynrf52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
273277
cplaynrf52840.menu.debug.l2=Level 2 (Full Debug)
274278
cplaynrf52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
275279
cplaynrf52840.menu.debug.l3=Level 3 (Segger SystemView)
276-
cplaynrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
280+
cplaynrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
281+
cplaynrf52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
277282

278283

279284
# ---------------------------------------------
@@ -327,7 +332,8 @@ cluenrf52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
327332
cluenrf52840.menu.debug.l2=Level 2 (Full Debug)
328333
cluenrf52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
329334
cluenrf52840.menu.debug.l3=Level 3 (Segger SystemView)
330-
cluenrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
335+
cluenrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
336+
cluenrf52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
331337

332338
# ----------------------------------
333339
# Bluefruit Metro nRF52840 Express
@@ -380,7 +386,8 @@ metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
380386
metro52840.menu.debug.l2=Level 2 (Full Debug)
381387
metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
382388
metro52840.menu.debug.l3=Level 3 (Segger SystemView)
383-
metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
389+
metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
390+
metro52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
384391

385392

386393

@@ -433,7 +440,8 @@ pca10056.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
433440
pca10056.menu.debug.l2=Level 2 (Full Debug)
434441
pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
435442
pca10056.menu.debug.l3=Level 3 (Segger SystemView)
436-
pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
443+
pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
444+
pca10056.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
437445

438446
# ----------------------------------
439447
# Particle Xenon
@@ -486,7 +494,8 @@ particle_xenon.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
486494
particle_xenon.menu.debug.l2=Level 2 (Full Debug)
487495
particle_xenon.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
488496
particle_xenon.menu.debug.l3=Level 3 (Segger SystemView)
489-
particle_xenon.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
497+
particle_xenon.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
498+
particle_xenon.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
490499

491500
# ----------------------------------
492501
# Raytac MDBT50Q - RX
@@ -539,4 +548,5 @@ mdbt50qrx.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
539548
mdbt50qrx.menu.debug.l2=Level 2 (Full Debug)
540549
mdbt50qrx.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
541550
mdbt50qrx.menu.debug.l3=Level 3 (Segger SystemView)
542-
mdbt50qrx.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -DCFG_SYSVIEW=1
551+
mdbt50qrx.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
552+
mdbt50qrx.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1

0 commit comments

Comments
 (0)