makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL #12733

fjmolinas · 2019-11-17T21:25:11Z

Contribution description

This PR uses DEBUG_ADAPTER_ID as the default value for JLINK_SERIAL. This way all
programmers use the same variable.

It also cleans-up the documentation for jlink.sh:

change term_rtt to term-rtt (common target namestyle)
adds missing term-rtt documentation

Testing procedure

Variable is correctly set.

JLINK_SERIAL=riot DEBUG_ADAPTER_ID=toto BOARD=nrf52dk make -C examples/hello-world/ info-debug-variable-JLINK_SERIAL
riot

DEBUG_ADAPTER_ID=toto BOARD=nrf52dk make -C examples/hello-world/ info-debug-variable-JLINK_SERIAL
toto

can reset the right BOARD, this fails in master:

I have 3 jlink devices connected nrf52dk, nrf52840dk, slstk3402a

PORT=/dev/ttyACM2 ~/workspace/RIOT/dist/tools/usb-serial/list-ttys.sh 
/sys/bus/usb/devices/4-1.5.7: SEGGER J-Link, serial: '000682770831', tty(s): ttyACM2
/sys/bus/usb/devices/4-1.5.3: SEGGER J-Link, serial: '000683890121', tty(s): ttyACM0
/sys/bus/usb/devices/4-1.5.4: Silicon Labs J-Link OB, serial: '000440113873', tty(s): ttyACM3

BOARD=slstk3402a make -C examples/hello-world/ reset

/home/francisco/workspace/RIOT/dist/tools/jlink/jlink.sh reset
### Resetting Target ###
SEGGER J-Link Commander V6.54c (Compiled Nov  7 2019 17:05:53)
DLL version V6.54c, compiled Nov  7 2019 17:05:41

J-Link Commander will now exit on Error

J-Link Command File read successfully.
Processing script file...

J-Link connection not established yet but required for command.
Connecting to J-Link via USB...O.K.
Firmware: Silicon Labs J-Link OB compiled Feb  1 2017 16:00:37
Hardware version: V1.00
S/N: 440113873
License(s): RDI
VTref=3.277V
Target connection not established yet but required for command.
Device "EFM32PG12BXXXF1024" selected.


Connecting to target via SWD
InitTarget() start
InitTarget() end
Found SW-DP with ID 0x2BA01477
Scanning AP map to find all available APs
AP[1]: Stopped AP scan as end of AP map has been reached
AP[0]: AHB-AP (IDR: 0x24770011)
Iterating through AP map to find AHB-AP to use
AP[0]: Core found
AP[0]: AHB-AP ROM base: 0xE00FF000
CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
Found Cortex-M4 r0p1, Little endian.
FPUnit: 6 code (BP) slots and 2 literal slots
CoreSight components:
ROMTbl[0] @ E00FF000
ROMTbl[0][0]: E000E000, CID: B105E00D, PID: 000BB00C SCS-M7
ROMTbl[0][1]: E0001000, CID: B105E00D, PID: 003BB002 DWT
ROMTbl[0][2]: E0002000, CID: B105E00D, PID: 002BB003 FPB
ROMTbl[0][3]: E0000000, CID: B105E00D, PID: 003BB001 ITM
ROMTbl[0][4]: E0040000, CID: B105900D, PID: 003BB923 TPIU-Lite
ROMTbl[0][5]: E0041000, CID: B105900D, PID: 000BB925 ETM
Cortex-M4 identified.
Reset delay: 0 ms
Reset type NORMAL: Resets core & peripherals via SYSRESETREQ & VECTRESET bit.
Reset: Halt core after reset via DEMCR.VC_CORERESET.
Reset: Reset device via AIRCR.SYSRESETREQ.



Script processing completed.

make: Leaving directory '/home/francisco/workspace/RIOT/examples/hello-world'

BOARD=nrf52840dk make -C examples/hello-world/ reset

/home/francisco/workspace/RIOT/dist/tools/jlink/jlink.sh reset
### Resetting Target ###
SEGGER J-Link Commander V6.54c (Compiled Nov  7 2019 17:05:53)
DLL version V6.54c, compiled Nov  7 2019 17:05:41

J-Link Commander will now exit on Error

J-Link Command File read successfully.
Processing script file...

J-Link connection not established yet but required for command.
Connecting to J-Link via USB...O.K.
Firmware: J-Link OB-SAM3U128-V2-NordicSemi compiled Jan  7 2019 14:07:15
Hardware version: V1.00
S/N: 683890121
VTref=3.300V
Target connection not established yet but required for command.
Device "NRF52" selected.


Connecting to target via SWD
InitTarget() start
InitTarget() end
Found SW-DP with ID 0x2BA01477
Scanning AP map to find all available APs
AP[2]: Stopped AP scan as end of AP map has been reached
AP[0]: AHB-AP (IDR: 0x24770011)
AP[1]: JTAG-AP (IDR: 0x02880000)
Iterating through AP map to find AHB-AP to use
AP[0]: Core found
AP[0]: AHB-AP ROM base: 0xE00FF000
CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
Found Cortex-M4 r0p1, Little endian.
FPUnit: 6 code (BP) slots and 2 literal slots
CoreSight components:
ROMTbl[0] @ E00FF000
ROMTbl[0][0]: E000E000, CID: B105E00D, PID: 000BB00C SCS-M7
ROMTbl[0][1]: E0001000, CID: B105E00D, PID: 003BB002 DWT
ROMTbl[0][2]: E0002000, CID: B105E00D, PID: 002BB003 FPB
ROMTbl[0][3]: E0000000, CID: B105E00D, PID: 003BB001 ITM
ROMTbl[0][4]: E0040000, CID: B105900D, PID: 000BB9A1 TPIU
ROMTbl[0][5]: E0041000, CID: B105900D, PID: 000BB925 ETM
Cortex-M4 identified.
Reset delay: 0 ms
Reset type NORMAL: Resets core & peripherals via SYSRESETREQ & VECTRESET bit.
Reset: Halt core after reset via DEMCR.VC_CORERESET.
Reset: Reset device via AIRCR.SYSRESETREQ.



Script processing completed.

make: Leaving directory '/home/francisco/workspace/RIOT/examples/hello-world'

BOARD=nrf52dk make -C examples/hello-world/ reset

/home/francisco/workspace/RIOT/dist/tools/jlink/jlink.sh reset
### Resetting Target ###
SEGGER J-Link Commander V6.54c (Compiled Nov  7 2019 17:05:53)
DLL version V6.54c, compiled Nov  7 2019 17:05:41

J-Link Commander will now exit on Error

J-Link Command File read successfully.
Processing script file...

J-Link connection not established yet but required for command.
Connecting to J-Link via USB...O.K.
Firmware: J-Link OB-SAM3U128-V2-NordicSemi compiled Jan  7 2019 14:07:15
Hardware version: V1.00
S/N: 682770831
VTref=3.300V
Target connection not established yet but required for command.
Device "NRF52" selected.


Connecting to target via SWD
InitTarget() start
InitTarget() end
Found SW-DP with ID 0x2BA01477
Scanning AP map to find all available APs
AP[2]: Stopped AP scan as end of AP map has been reached
AP[0]: AHB-AP (IDR: 0x24770011)
AP[1]: JTAG-AP (IDR: 0x02880000)
Iterating through AP map to find AHB-AP to use
AP[0]: Core found
AP[0]: AHB-AP ROM base: 0xE00FF000
CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
Found Cortex-M4 r0p1, Little endian.
FPUnit: 6 code (BP) slots and 2 literal slots
CoreSight components:
ROMTbl[0] @ E00FF000
ROMTbl[0][0]: E000E000, CID: B105E00D, PID: 000BB00C SCS-M7
ROMTbl[0][1]: E0001000, CID: B105E00D, PID: 003BB002 DWT
ROMTbl[0][2]: E0002000, CID: B105E00D, PID: 002BB003 FPB
ROMTbl[0][3]: E0000000, CID: B105E00D, PID: 003BB001 ITM
ROMTbl[0][4]: E0040000, CID: B105900D, PID: 000BB9A1 TPIU
ROMTbl[0][5]: E0041000, CID: B105900D, PID: 000BB925 ETM
Cortex-M4 identified.
Reset delay: 0 ms
Reset type NORMAL: Resets core & peripherals via SYSRESETREQ & VECTRESET bit.
Reset: Halt core after reset via DEMCR.VC_CORERESET.
Reset: Reset device via AIRCR.SYSRESETREQ.



Script processing completed.

make: Leaving directory '/home/francisco/workspace/RIOT/examples/hello-world'

- fixed doc:

./dist/tools/jlink/jlink.sh help
Usage: ./dist/tools/jlink/jlink.sh {flash|debug|debug-server|reset|term-rtt}
          flash <binfile>
          debug <elffile>

benpicco

Change makes sense for consistency.

aabadie

I think there's something missing.

aabadie · 2019-11-18T09:16:15Z

makefiles/tools/jlink.inc.mk

@@ -9,3 +9,5 @@ FFLAGS ?= flash $(FLASHFILE)
 DEBUGGER_FLAGS ?= debug $(ELFFILE)
 DEBUGSERVER_FLAGS ?= debug-server
 RESET_FLAGS ?= reset
+
+JLINK_SERIAL ?= $(DEBUG_ADAPTER_ID)


This should be exported if it's used in jlink.sh

Thanks for spotting this @aabadie, you are right. I'm thinkking of the best place to export. Will adddress and fix the test procedure.

fjmolinas · 2019-11-18T11:47:22Z

@aabadie I updated the PR description and fixed the testing procedure.

boards/thingy52/Makefile.include

Makefile.include

- export JLINK_SERIAL for required targets

aabadie

ACK

fjmolinas added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Nov 17, 2019

fjmolinas requested a review from aabadie November 17, 2019 21:25

benpicco approved these changes Nov 17, 2019

View reviewed changes

aabadie requested changes Nov 18, 2019

View reviewed changes

fjmolinas force-pushed the pr_jlink_serial branch from a4cb297 to 83b800a Compare November 18, 2019 10:48

aabadie reviewed Nov 18, 2019

View reviewed changes

boards/thingy52/Makefile.include Outdated Show resolved Hide resolved

aabadie reviewed Nov 18, 2019

View reviewed changes

Makefile.include Outdated Show resolved Hide resolved

fjmolinas added 2 commits November 18, 2019 13:04

dist/tools/jlink: cleanup doc

f9ebc86

makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL

05782d1

- export JLINK_SERIAL for required targets

fjmolinas removed the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Nov 18, 2019

fjmolinas force-pushed the pr_jlink_serial branch from 83b800a to 05782d1 Compare November 18, 2019 12:05

fjmolinas added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Nov 18, 2019

aabadie approved these changes Nov 18, 2019

View reviewed changes

aabadie merged commit 588766a into RIOT-OS:master Nov 18, 2019

fjmolinas deleted the pr_jlink_serial branch December 1, 2019 14:17

fjmolinas added this to the Release 2020.01 milestone Dec 13, 2019

bergzand mentioned this pull request Jan 9, 2020

boards: add initial support for the PINE64 PineTime smartwatch #12552

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL #12733

makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL #12733

Uh oh!

fjmolinas commented Nov 17, 2019 •

edited

Loading

Uh oh!

benpicco left a comment

Uh oh!

aabadie left a comment

Uh oh!

aabadie Nov 18, 2019

Uh oh!

fjmolinas Nov 18, 2019

Uh oh!

fjmolinas commented Nov 18, 2019

Uh oh!

Uh oh!

Uh oh!

aabadie left a comment

Uh oh!

Uh oh!

makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL #12733

makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL #12733

Uh oh!

Conversation

fjmolinas commented Nov 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution description

Testing procedure

Uh oh!

benpicco left a comment

Choose a reason for hiding this comment

Uh oh!

aabadie left a comment

Choose a reason for hiding this comment

Uh oh!

aabadie Nov 18, 2019

Choose a reason for hiding this comment

Uh oh!

fjmolinas Nov 18, 2019

Choose a reason for hiding this comment

Uh oh!

fjmolinas commented Nov 18, 2019

Uh oh!

Uh oh!

Uh oh!

aabadie left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fjmolinas commented Nov 17, 2019 •

edited

Loading