Fix flashing of CC3200

`sig` vs `sign` attribute for signed parts. CL: none PUBLISHED_FROM=4effbf0d8bd95d2a6684412c394a49fbf59a2ee2
cesanta · Dec 3, 2018 · 33d4b5c · 33d4b5c
1 parent 33205bf
commit 33d4b5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/common/go/fwbundle/fw_part.go b/common/go/fwbundle/fw_part.go
@@ -36,6 +36,8 @@ type firmwarePart struct {
 	CC32XXFileAllocSize int    `json:"falloc,omitempty"`
 	CC32XXFileSignature string `json:"sig,omitempty"`
 	CC32XXSigningCert   string `json:"sig_cert,omitempty"`
+	// Deprecated, not being used since 2018/12/03.
+	CC3200FileSignature string `json:"sign,omitempty"`
 
 	// Other user-specified properties are preserved here.
 	properties   map[string]interface{}

diff --git a/mos/flash/cc3200/flasher.go b/mos/flash/cc3200/flasher.go
@@ -64,10 +64,14 @@ func Flash(fw *fwbundle.FirmwareBundle, opts *FlashOpts) error {
 			if err != nil {
 				return errors.Annotatef(err, "%s: failed to get data", p.Name)
 			}
-			if p.CC32XXFileSignature != "" {
-				fs, err := fw.GetPartData(p.CC32XXFileSignature)
+			sig := p.CC32XXFileSignature
+			if sig == "" {
+				sig = p.CC3200FileSignature
+			}
+			if sig != "" {
+				fs, err := fw.GetPartData(sig)
 				if err != nil {
-					return errors.Annotatef(err, "%s: failed to get signature data (%s)", p.Name, p.CC32XXFileSignature)
+					return errors.Annotatef(err, "%s: failed to get signature data (%s)", p.Name, sig)
 				}
 				if len(fs) != cc32xx.FileSignatureLength {
 					return errors.Errorf("%s: invalid signature length (%d)", p.Name, len(fi.Signature))