You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2019/04/24 11:53:23 UTC

[mynewt-newt] branch master updated: Use 2.0 image format by default

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git


The following commit(s) were added to refs/heads/master by this push:
     new bbddd2c  Use 2.0 image format by default
bbddd2c is described below

commit bbddd2c16df09ce70a883ec7cc7b879e2e6ee70f
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Wed Apr 17 12:06:08 2019 +0200

    Use 2.0 image format by default
    
    Now that Mynewt switched to mcuboot and removed legacy boootutils it
    make sense to use new format by default.
---
 newt/cli/image_cmds.go | 6 +++---
 newt/cli/run_cmds.go   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/newt/cli/image_cmds.go b/newt/cli/image_cmds.go
index 0632a6c..d9403be 100644
--- a/newt/cli/image_cmds.go
+++ b/newt/cli/image_cmds.go
@@ -81,8 +81,8 @@ func createImageRunCmd(cmd *cobra.Command, args []string) {
 		NewtUsage(cmd, util.NewNewtError("Either -1, or -2, but not both"))
 	}
 
-	if !useV2 {
-		useV1 = true
+	if !useV1 {
+		useV2 = true
 	}
 
 	TryGetProject()
@@ -184,7 +184,7 @@ func AddImageCommands(cmd *cobra.Command) {
 	createImageCmd.PersistentFlags().BoolVarP(&useV1,
 		"1", "1", false, "Use old image header format")
 	createImageCmd.PersistentFlags().BoolVarP(&useV2,
-		"2", "2", false, "Use new image header format")
+		"2", "2", false, "Use new image header format (default)")
 	createImageCmd.PersistentFlags().StringVarP(&encKeyFilename,
 		"encrypt", "e", "", "Encrypt image using this public key")
 
diff --git a/newt/cli/run_cmds.go b/newt/cli/run_cmds.go
index 28d43f6..c46508e 100644
--- a/newt/cli/run_cmds.go
+++ b/newt/cli/run_cmds.go
@@ -40,8 +40,8 @@ func runRunCmd(cmd *cobra.Command, args []string) {
 	if useV1 && useV2 {
 		NewtUsage(cmd, util.NewNewtError("Either -1, or -2, but not both"))
 	}
-	if !useV2 {
-		useV1 = true
+	if !useV1 {
+		useV2 = true
 	}
 
 	TryGetProject()
@@ -153,7 +153,7 @@ func AddRunCommands(cmd *cobra.Command) {
 	runCmd.PersistentFlags().BoolVarP(&useV1,
 		"1", "1", false, "Use old image header format")
 	runCmd.PersistentFlags().BoolVarP(&useV2,
-		"2", "2", false, "Use new image header format")
+		"2", "2", false, "Use new image header format (default)")
 
 	cmd.AddCommand(runCmd)
 	AddTabCompleteFn(runCmd, func() []string {