[microTVM] Zephyr: refactor _find_openocd_serial_port #10346
Conversation
gromero
requested review from
tqchen,
jroesch,
yzhliu,
icemelon,
junrushao,
comaniac and
zhiics
as code owners
|
|
||
| return autodetected_openocd_serial | ||
|
|
||
|
|
||
| def _get_openocd_device_args(options): | ||
| return ["--serial", openocd_serial(options)] |
There was a problem hiding this comment.
openocd_serial is still used here.
There was a problem hiding this comment.
@mehrdadh Thanks for catching it! I'll promote _generic_find_serial_port() to a module method so it can be used in _get_openocd_device_args.
|
I think you need to rebase because of this PR: #10304 |
Refactor _find_openocd_serial_port() as a generic USB serial port finder since other runners beyond openocd use it (e.g. jlink runner). Also instead of using redundant hardcoded values in BOARD_USB_FIND_KW dict, use idVendor and idProduct from boards.json. And don't use 'usb' module to first find the serial number of the port and then pass it to 'serial' module to obtain the port path, instead search for the port path directly via 'serial' module using the serial number (if provided) or use idVendor and idProduct values taken from boards.json. Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
gromero
force-pushed
the
refactor_microtvm_serial_port_finder
branch
from
25dd703 to
bd82437
Compare
@mehrdadh I've pushed a rebased version. However diff shown by GH is total crap imo. So maybe you would need to pull the changes and check the modified file locally. I don't know why GH (and git apparently too) is doing such a horrible diff work. I've tried different diff algorithms and nothing really improved :S Could you please test it against your hardware fleet? :) |
@gromero I can test your changes on the hardware, we are just waiting for an unrelated fix to land, then I'll run your branch. Your rebase looks good to me from the perspective of merging in the #10304 changes. |
@alanmacd Hi Alan. Thanks a lot for the review and for testing the change against the hw fleet there ;) |
@gromero I ran you changes last night, the testing run looks good. |
|
Thanks @alanmacd for testing on hardware fleet! |
|
thanks @gromero ! |
Refactor _find_openocd_serial_port() as a generic USB serial port finder since other runners beyond openocd use it (e.g. jlink runner). Also instead of using redundant hardcoded values in BOARD_USB_FIND_KW dict, use idVendor and idProduct from boards.json. And don't use 'usb' module to first find the serial number of the port and then pass it to 'serial' module to obtain the port path, instead search for the port path directly via 'serial' module using the serial number (if provided) or use idVendor and idProduct values taken from boards.json. Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Refactor _find_openocd_serial_port() as a generic USB serial port
finder since other runners beyond openocd use it (e.g. jlink runner).
Also instead of using redundant hardcoded values in BOARD_USB_FIND_KW
dict, use idVendor and idProduct from boards.json. And don't use 'usb'
module to first find the serial number of the port and then pass it to
'serial' module to obtain the port path, instead search for the port
path directly via 'serial' module using the serial number (if provided)
or use idVendor and idProduct values taken from boards.json.
Signed-off-by: Gustavo Romero gustavo.romero@linaro.org