commit da2aaab703c97207f2377453554ae0739f7c23e0
author Tom Joseph <rushtotom@gmail.com> Sun Aug 01 19:23:09 2021 -0700
committer Tom Joseph <rushtotom@gmail.com> Wed Sep 08 09:59:50 2021 +0000
tree 6d4c34f63fd88b6850d2ae7b1ffd4953a119aeed
parent e5bbe0d0555f25ac3d7ba2a7dbd99dfb59c38f45

tools: Extend pldm_fwup_pkg_creator

Extend the pldm_fwup_pkg_creator script to handle multiple record
descriptors in the firmware device ID record. The metadata json also
handles vendor defined descriptors.

Tested: Verified this change by using the updated json in the patch
and sample images to create a package. The fields of the package
header were verified for accuracy.

Signed-off-by: Tom Joseph <rushtotom@gmail.com>
Change-Id: I9efde5689e551170b46a4e6ee4ea1e5624173420

tools/fw-update/metadata-example.json

diff --git a/tools/fw-update/metadata-example.json b/tools/fw-update/metadata-example.json
index 70751ad..6584ed9 100644
--- a/tools/fw-update/metadata-example.json
+++ b/tools/fw-update/metadata-example.json
@@ -1,7 +1,7 @@
 {
     "PackageHeaderInformation": {
-        "PackageHeaderIdentifier": "1244D2648D7D4718A030FC8A56587D5A",
-        "PackageHeaderFormatVersion": 2,
+        "PackageHeaderIdentifier": "F018878CCB7D49439800A02F059ACA02",
+        "PackageHeaderFormatVersion": 1,
         "PackageReleaseDateTime": "25/12/2021 00:00:00",
         "PackageVersionString": "VersionString1"
     },
@@ -15,10 +15,21 @@
                 100,
                 200
             ],
-            "InitialDescriptor": {
-                "InitialDescriptorType": 2,
-                "InitialDescriptorData": "1244D2648D7D4718A030FC8A56587D5B"
-            }
+            "Descriptors": [
+                {
+                    "DescriptorType": 2,
+                    "DescriptorData": "1244D2648D7D4718A030FC8A56587D5B"
+                },
+                {
+                    "DescriptorType": 1,
+                    "DescriptorData": "47160000"
+                },
+                {
+                    "DescriptorType": 65535,
+                    "VendorDefinedDescriptorTitleString": "OpenBMC",
+                    "VendorDefinedDescriptorData": "1234"
+                }
+            ]
         },
         {
             "DeviceUpdateOptionFlags": [
@@ -29,10 +40,12 @@
                 200,
                 300
             ],
-            "InitialDescriptor": {
-                "InitialDescriptorType": 2,
-                "InitialDescriptorData": "1244D2648D7D4718A030FC8A56587D5C"
-            }
+            "Descriptors": [
+                {
+                    "DescriptorType": 2,
+                    "DescriptorData": "1244D2648D7D4718A030FC8A56587D5C"
+                }
+            ]
         },
         {
             "DeviceUpdateOptionFlags": [
@@ -41,10 +54,12 @@
             "ApplicableComponents": [
                 100
             ],
-            "InitialDescriptor": {
-                "InitialDescriptorType": 2,
-                "InitialDescriptorData": "1244D2648D7D4718A030FC8A56587D5D"
-            }
+            "Descriptors": [
+                {
+                    "DescriptorType": 2,
+                    "DescriptorData": "1244D2648D7D4718A030FC8A56587D5D"
+                }
+            ]
         }
     ],
     "ComponentImageInformationArea": [