Skip to content

[microTVM][Zephyr] Fix flash command for nrfjprog #13723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 9, 2023
Merged

[microTVM][Zephyr] Fix flash command for nrfjprog #13723

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1881fd5
Fix NRF find serial
mehrdadh Jan 7, 2023
9126b5e
address comment
mehrdadh Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions apps/microtvm/zephyr/template_project/microtvm_api_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,11 @@ def _get_openocd_device_args(serial_number: str = None):
return ["--serial", generic_find_serial_port(serial_number)]


def _get_nrf_device_args(serial_number: str = None):
def _get_nrf_device_args(serial_number: str = None) -> list:
# iSerial has string type which could mistmatch with
# the output of `nrfjprog --ids`. Example: 001050007848 vs 1050007848
serial_number = serial_number.lstrip("0")

nrfjprog_args = ["nrfjprog", "--ids"]
nrfjprog_ids = subprocess.check_output(nrfjprog_args, encoding="utf-8")
if not nrfjprog_ids.strip("\n"):
Expand All @@ -276,9 +280,7 @@ def _get_nrf_device_args(serial_number: str = None):
)

if serial_number not in boards:
raise BoardError(
f"serial number ({serial_number}) not found in {nrfjprog_args}: {boards}"
)
raise BoardError(f"serial number ({serial_number}) not found in {boards}")

return ["--snr", serial_number]

Expand Down Expand Up @@ -714,23 +716,27 @@ def flash(self, options):
if _find_platform_from_cmake_file(API_SERVER_DIR / CMAKELIST_FILENAME):
return # NOTE: qemu requires no flash step--it is launched from open_transport.

flash_runner = _get_flash_runner()
# The nRF5340DK requires an additional `nrfjprog --recover` before each flash cycle.
# This is because readback protection is enabled by default when this device is flashed.
# Otherwise, flashing may fail with an error such as the following:
# ERROR: The operation attempted is unavailable due to readback protection in
# ERROR: your device. Please use --recover to unlock the device.
zephyr_board = _find_board_from_cmake_file(API_SERVER_DIR / CMAKELIST_FILENAME)
if zephyr_board.startswith("nrf5340dk") and _get_flash_runner() == "nrfjprog":
if zephyr_board.startswith("nrf5340dk") and flash_runner == "nrfjprog":
recover_args = ["nrfjprog", "--recover"]
recover_args.extend(_get_nrf_device_args(serial_number))
check_call(recover_args, cwd=API_SERVER_DIR / "build")

flash_extra_args = []
if _get_flash_runner() == "openocd" and serial_number:
flash_extra_args = ["--cmd-pre-init", f"""hla_serial {serial_number}"""]
if flash_runner == "openocd" and serial_number:
flash_extra_args += ["--cmd-pre-init", f"""hla_serial {serial_number}"""]
Copy link
Member

@guberti guberti Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
flash_extra_args += ["--cmd-pre-init", f"""hla_serial {serial_number}"""]
flash_extra_args += ["--cmd-pre-init", f"hla_serial {serial_number}"]

Copy link
Member Author

@mehrdadh mehrdadh Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember testing this without "" around the hla_serial option and it was not working

Copy link
Contributor

@gromero gromero Jan 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mehrdadh I wonder if it would be f'"hla_serial {serial_number}"', because afaics the triple double-quote in f-string won't expand to an additional double quote -- as I think @guberti pointed out, but I also think it's necessary one double-quite in the final string for the command as you said / experimented.

Copy link
Member Author

@mehrdadh mehrdadh Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will test this again and fix it in a follow up PR if that was the case


if flash_runner == "nrfjprog":
flash_extra_args += _get_nrf_device_args(serial_number)

check_call(
west_cmd_list + ["flash", "-r", _get_flash_runner()] + flash_extra_args,
west_cmd_list + ["flash", "-r", flash_runner] + flash_extra_args,
cwd=API_SERVER_DIR / "build",
)

Expand Down