You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2019/10/21 16:37:47 UTC

[mynewt-artifact] branch master updated (91a9bc9 -> b688b2c)

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

ccollins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-artifact.git.


    from 91a9bc9  Fix issues with hash calculation
     new 703f371  mfg_manifest: Include raw sections in manifest
     new b688b2c  New mfg manifest fields: target.extra, raw.extra

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 manifest/mfg_manifest.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)


[mynewt-artifact] 01/02: mfg_manifest: Include raw sections in manifest

Posted by cc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 703f371e8a93e3edf50086a7db5572b792d0d6e7
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Fri Oct 18 14:32:00 2019 -0700

    mfg_manifest: Include raw sections in manifest
---
 manifest/mfg_manifest.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/manifest/mfg_manifest.go b/manifest/mfg_manifest.go
index f742e12..6687f9a 100644
--- a/manifest/mfg_manifest.go
+++ b/manifest/mfg_manifest.go
@@ -38,6 +38,12 @@ type MfgManifestTarget struct {
 	ManifestPath string `json:"manifest_path"`
 }
 
+type MfgManifestRaw struct {
+	Filename string `json:"filename"`
+	Offset   int    `json:"offset"`
+	BinPath  string `json:"bin_path"`
+}
+
 type MfgManifestMetaMmr struct {
 	Area      string `json:"area"`
 	Device    int    `json:"_device"`
@@ -72,6 +78,7 @@ type MfgManifest struct {
 	FlashAreas []flash.FlashArea `json:"flash_map"`
 
 	Targets []MfgManifestTarget `json:"targets"`
+	Raws    []MfgManifestRaw    `json:"raws"`
 	Meta    *MfgManifestMeta    `json:"meta,omitempty"`
 }
 


[mynewt-artifact] 02/02: New mfg manifest fields: target.extra, raw.extra

Posted by cc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b688b2c0ae796ab1dade84e8a1d603ac71f64aa1
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Fri Oct 18 16:59:07 2019 -0700

    New mfg manifest fields: target.extra, raw.extra
    
    Add a new field to the `target` and `raw` mfg manifest items:
    `extra_manifest`.  This field is a generic map that gets passed through
    from the mfg definition.  This field is useful if the user needs to
    convey additional information to some system that knows how to parse a
    manufacturing manifest file.
---
 manifest/mfg_manifest.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/manifest/mfg_manifest.go b/manifest/mfg_manifest.go
index 6687f9a..0509f1a 100644
--- a/manifest/mfg_manifest.go
+++ b/manifest/mfg_manifest.go
@@ -30,18 +30,20 @@ import (
 )
 
 type MfgManifestTarget struct {
-	Name         string `json:"name"`
-	Offset       int    `json:"offset"`
-	BinPath      string `json:"bin_path,omitempty"`
-	ImagePath    string `json:"image_path,omitempty"`
-	HexPath      string `json:"hex_path,omitempty"`
-	ManifestPath string `json:"manifest_path"`
+	Name         string                 `json:"name"`
+	Offset       int                    `json:"offset"`
+	BinPath      string                 `json:"bin_path,omitempty"`
+	ImagePath    string                 `json:"image_path,omitempty"`
+	HexPath      string                 `json:"hex_path,omitempty"`
+	ManifestPath string                 `json:"manifest_path"`
+	Extra        map[string]interface{} `json:"extra,omitempty"`
 }
 
 type MfgManifestRaw struct {
-	Filename string `json:"filename"`
-	Offset   int    `json:"offset"`
-	BinPath  string `json:"bin_path"`
+	Filename string                 `json:"filename"`
+	Offset   int                    `json:"offset"`
+	BinPath  string                 `json:"bin_path"`
+	Extra    map[string]interface{} `json:"extra,omitempty"`
 }
 
 type MfgManifestMetaMmr struct {