You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by pa...@apache.org on 2016/08/31 19:56:53 UTC
incubator-mynewt-newt git commit: MYNEWT-377
Repository: incubator-mynewt-newt
Updated Branches:
refs/heads/develop 319e51082 -> 0ca269a01
MYNEWT-377
still pass 0 based index to download script, but adjust for printout in newt. Also, check bootloader feature and print more relevant message when downloading a bootloader
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/0ca269a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/0ca269a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/0ca269a0
Branch: refs/heads/develop
Commit: 0ca269a015ea3cd63cfd6bf409eb69f398bb6c3e
Parents: 319e510
Author: Paul Dietrich <pa...@yahoo.com>
Authored: Wed Aug 31 12:55:42 2016 -0700
Committer: Paul Dietrich <pa...@yahoo.com>
Committed: Wed Aug 31 12:56:45 2016 -0700
----------------------------------------------------------------------
newt/builder/load.go | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/0ca269a0/newt/builder/load.go
----------------------------------------------------------------------
diff --git a/newt/builder/load.go b/newt/builder/load.go
index cdb0074..7c92400 100644
--- a/newt/builder/load.go
+++ b/newt/builder/load.go
@@ -78,8 +78,16 @@ func (b *Builder) Load(image_slot int) error {
downloadCmd := fmt.Sprintf("%s %s %s %d %s",
downloadScript, bspPath, binBaseName, image_slot, featureString)
- util.StatusMessage(util.VERBOSITY_DEFAULT,
- "Loading %s image int slot %d\n", b.buildName, image_slot)
+ features := b.Features(nil)
+
+ if _, ok := features["bootloader"]; ok {
+ util.StatusMessage(util.VERBOSITY_DEFAULT,
+ "Loading bootloader\n")
+ } else {
+ util.StatusMessage(util.VERBOSITY_DEFAULT,
+ "Loading %s image into slot %d\n", b.buildName, image_slot+1)
+ }
+
util.StatusMessage(util.VERBOSITY_VERBOSE, "Load command: %s\n",
downloadCmd)
rsp, err := util.ShellCommand(downloadCmd)