Skip to content
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.

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

Revamp deploy.py #78

Merged
merged 11 commits into from
Mar 12, 2020
Merged

Revamp deploy.py #78

merged 11 commits into from
Mar 12, 2020

Conversation

jmichelp
Copy link
Collaborator

Now the script supports more flashing methods:

  • JLink (with tockloader)
  • OpenOCD (with tockloader)
  • pyOCD
  • Nordic DFU
  • none (will produce an IntelHex file)

Also merged the contributions from:

  • Yihui Xiong to support the Makerdiary USB dongle board
  • Dennis Geurts to support Nordic DFU

Doc updated accordingly.

Imported 2 patches for Tock kernel:

Fixes #3
Fixes #70

  • Tests pass
  • Appropriate changes to README are included in PR

@jmichelp jmichelp requested a review from gendx March 11, 2020 16:16
Copy link
Collaborator

@gendx gendx left a comment

Choose a reason for hiding this comment

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

Imported 2 patches for Tock kernel:

This shouldn't be needed after #77.

README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
boards/nrf52840_mdk_dfu/src/io.rs Show resolved Hide resolved
deploy.py Show resolved Hide resolved
deploy.py Show resolved Hide resolved
deploy.py Show resolved Hide resolved
Now the script supports more flashing methods:
- JLink (with tockloader)
- OpenOCD (with tockloader)
- pyOCD
- Nordic DFU
- none (will produce an IntelHex file)

Also merged the contributions from:
- Yihui Xiong to support the Makerdiary USB dongle board
- Dennis Geurts to support Nordic DFU

Doc updated accordingly.

Imported 2 patches for Tock kernel:
- 06-add-set_vector_table_offset.patch (upstream tock/tock#1579)
- 07-nrf52-bootloader.patch (upstream tock/tock#1681)
@jmichelp jmichelp requested a review from gendx March 11, 2020 17:35
Copy link
Collaborator

@gendx gendx left a comment

Choose a reason for hiding this comment

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

Can you update the GitHub workflows to build the new boards?

info("Installing Tock on board {}".format(self.args.board))
self.build_and_install_tockos()
if not self.args.tockos and not self.args.application:
info("Nothing to do.")
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd return a non-zero error code in that case so that people are aware they need to provide something to do in their command line?

boards/nrf52840_mdk_dfu/src/io.rs Show resolved Hide resolved
@@ -19,8 +19,9 @@ successfully tested on the following boards:

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do you want to mention the DFU-based boards in this README? And the DFU limitations regarding re-flashing Tock?

patches/tock/07-nrf52-bootloader.patch Outdated Show resolved Hide resolved
deploy.py Outdated Show resolved Hide resolved
deploy.py Outdated Show resolved Hide resolved
deploy.py Outdated Show resolved Hide resolved
deploy.py Outdated Show resolved Hide resolved
deploy.py Outdated Show resolved Hide resolved
gendx
gendx previously approved these changes Mar 12, 2020
@jmichelp jmichelp merged commit ec1ce66 into google:master Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reproducible builds NRF52840 boards?
2 participants