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

flashing: do not give bossac the offset parameter if not explicitly provided. #22179

Merged

Conversation

KubaFYI
Copy link
Contributor

@KubaFYI KubaFYI commented Jan 24, 2020

Doesn't feed bossac the offset parameter unless explicitly requested. This allows the runner to play nicely with earlier versions of bossac.

Fixes: #22171

Signed-off-by: Kuba Sanak [email protected]

@zephyrbot
Copy link
Collaborator

zephyrbot commented Jan 24, 2020

All checks are passing now.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

@KubaFYI KubaFYI force-pushed the fix_bossac_runner_parameter_#22171 branch from c2e5093 to 4aee4e5 Compare January 24, 2020 17:38
@KubaFYI KubaFYI changed the title Do not give bossac the offset parameter if not explicitly provided. flashing: do not give bossac the offset parameter if not explicitly provided. Jan 24, 2020
@mbolivar
Copy link
Contributor

For future reference, please force-push into your existing branches instead of closing a pull request and opening a new one. Closing PRs makes it harder for reviewers to track comments and their resolution. See the zephyr contribution guidelines for more details.

Copy link
Contributor

@mbolivar mbolivar left a comment

Choose a reason for hiding this comment

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

@galak up to you if this covers what you asked for in the other PR; it's fine with me

'-b', self.cfg.bin_file]
if self.offset is not None:
cmd_flash = cmd_flash + ['-o', '%s' % self.offset]
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor nit, an in-place update would be slightly preferable style-wise:

Suggested change
cmd_flash = cmd_flash + ['-o', '%s' % self.offset]
cmd_flash += ['-o', '%s' % self.offset]

@mbolivar
Copy link
Contributor

@KubaFYI please take a look at the shippable error and make sure the tests are passing. See the README in the west_commands directory for info on running tests.

This fixes a problem which appeared after bossac version was downgraded
to 1.7 which no longer accepts the -o/--offset parameter. Now the offset
is fed to bossac executable only if it's explicitly provided and not by
default.

Signed-off-by: Kuba Sanak <[email protected]>
@KubaFYI KubaFYI force-pushed the fix_bossac_runner_parameter_#22171 branch from 4aee4e5 to 570540e Compare January 27, 2020 15:38
@galak galak merged commit c0e31e7 into zephyrproject-rtos:master Jan 28, 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.

West bossac runner inorrectly tries to include an offset parameter when flashing
4 participants