bcmflash: Create fully valid firmware images for supported targets. (#158)

- Use captured Info and Info2 sections for real firmware images.
- Include valid VPD information when creating full fw images.

1 files changed, 31 insertions, 24 deletions

diff --git a/include/bcm5719_eeprom.h b/include/bcm5719_eeprom.h
index 8ba579e..1b61d4f 100644
--- a/include/bcm5719_eeprom.h
+++ b/include/bcm5719_eeprom.h
@@ -169,11 +169,11 @@ typedef struct {
     uint8_t     mfrData[4];
 
 #ifdef __LITTLE_ENDIAN__
-    uint16_t    func0PXEVLAN;
     uint16_t    func1PXEVLAN;
+    uint16_t    func0PXEVLAN;
 #else
-    uint16_t    func1PXEVLAN;
     uint16_t    func0PXEVLAN;
+    uint16_t    func1PXEVLAN;
 #endif
 
 #ifdef __LITTLE_ENDIAN__
@@ -193,15 +193,15 @@ typedef struct {
 #endif
 
 #ifdef __LITTLE_ENDIAN__
-    uint8_t     SMBusAddrBMC;
-    uint8_t     SMBusAddr;
-
-    uint16_t    cpuClock;           /*< 66MHz, Legacy */
-#else
     uint16_t    cpuClock;           /*< 66MHz, Legacy */
 
     uint8_t     SMBusAddr;
     uint8_t     SMBusAddrBMC;
+#else
+    uint8_t     SMBusAddrBMC;
+    uint8_t     SMBusAddr;
+
+    uint16_t    cpuClock;           /*< 66MHz, Legacy */
 #endif
 
     uint32_t    macAddr0Backup[2];
@@ -210,15 +210,15 @@ typedef struct {
     union {
         struct {
 #ifdef __LITTLE_ENDIAN__
-            uint8_t     powerDissipatedD0;  /*< Power dissipated in the D0 state. Note: The data scale is hard coded at 0.1. */
-            uint8_t     powerDissipatedD1;  /*< Power dissipated in the D1 state. The NetXtreme II family does not support the D1 state. */
-            uint8_t     powerDissipatedD2;  /*< Power dissipated in the D2 state. The NetXtreme II family does not support the D2 state. */
-            uint8_t     powerDissipatedD3;  /*< Power dissipated in the D3 state. Note: The data scale is hard coded at 0.1. */
-#else
             uint8_t     powerDissipatedD3;  /*< Power dissipated in the D3 state. Note: The data scale is hard coded at 0.1. */
             uint8_t     powerDissipatedD2;  /*< Power dissipated in the D2 state. The NetXtreme II family does not support the D2 state. */
             uint8_t     powerDissipatedD1;  /*< Power dissipated in the D1 state. The NetXtreme II family does not support the D1 state. */
             uint8_t     powerDissipatedD0;  /*< Power dissipated in the D0 state. Note: The data scale is hard coded at 0.1. */
+#else
+            uint8_t     powerDissipatedD0;  /*< Power dissipated in the D0 state. Note: The data scale is hard coded at 0.1. */
+            uint8_t     powerDissipatedD1;  /*< Power dissipated in the D1 state. The NetXtreme II family does not support the D1 state. */
+            uint8_t     powerDissipatedD2;  /*< Power dissipated in the D2 state. The NetXtreme II family does not support the D2 state. */
+            uint8_t     powerDissipatedD3;  /*< Power dissipated in the D3 state. Note: The data scale is hard coded at 0.1. */
 #endif
         };
         uint32_t     powerDissipated;
@@ -227,15 +227,15 @@ typedef struct {
     union {
         struct {
 #ifdef __LITTLE_ENDIAN__
-            uint8_t     powerConsumedD0;    /*< Power consumed in the D0 state. Note: The data scale is hard coded at 0.1. */
-            uint8_t     powerConsumedD1;    /*< Power consumed in the D1 state. The NetXtreme II family does not support the D1 state. */
-            uint8_t     powerConsumedD2;    /*< Power consumed in the D2 state. The NetXtreme II family does not support the D2 state. */
-            uint8_t     powerConsumedD3;    /*< Power consumed in the D3 state. Note: The data scale is hard coded at 0.1. */
-#else
             uint8_t     powerConsumedD3;    /*< Power consumed in the D3 state. Note: The data scale is hard coded at 0.1. */
             uint8_t     powerConsumedD2;    /*< Power consumed in the D2 state. The NetXtreme II family does not support the D2 state. */
             uint8_t     powerConsumedD1;    /*< Power consumed in the D1 state. The NetXtreme II family does not support the D1 state. */
             uint8_t     powerConsumedD0;    /*< Power consumed in the D0 state. Note: The data scale is hard coded at 0.1. */
+#else
+            uint8_t     powerConsumedD0;    /*< Power consumed in the D0 state. Note: The data scale is hard coded at 0.1. */
+            uint8_t     powerConsumedD1;    /*< Power consumed in the D1 state. The NetXtreme II family does not support the D1 state. */
+            uint8_t     powerConsumedD2;    /*< Power consumed in the D2 state. The NetXtreme II family does not support the D2 state. */
+            uint8_t     powerConsumedD3;    /*< Power consumed in the D3 state. Note: The data scale is hard coded at 0.1. */
 #endif
         };
         uint32_t     powerConsumed;
@@ -254,18 +254,18 @@ typedef struct {
     uint32_t    powerBudget1;
     uint32_t    serworksUse;
 #ifdef __LITTLE_ENDIAN__
-    uint16_t    func0SERDESOverride;
     uint16_t    func1SERDESOverride;
+    uint16_t    func0SERDESOverride;
 #else
-    uint16_t    func1SERDESOverride;
     uint16_t    func0SERDESOverride;
+    uint16_t    func1SERDESOverride;
 #endif
 #ifdef __LITTLE_ENDIAN__
-    uint16_t    macNVMSize;
     uint16_t    tpmNVMSize;
+    uint16_t    macNVMSize;
 #else
-    uint16_t    tpmNVMSize;
     uint16_t    macNVMSize;
+    uint16_t    tpmNVMSize;
 #endif
     uint32_t    powerBudget2;
     uint32_t    powerBudget3;
@@ -274,11 +274,11 @@ typedef struct {
 
 typedef struct {
 #ifdef __LITTLE_ENDIAN__
-    uint16_t    mfr2Len;                //   [202] 00 8C          -- Length of manufacturing section 2.
     uint16_t    mfr2Unk;                //   [200] 00 00          -- Unknown, probably unused.
+    uint16_t    mfr2Len;                //   [202] 00 8C          -- Length of manufacturing section 2.
 #else
-    uint16_t    mfr2Unk;                //   [200] 00 00          -- Unknown, probably unused.
     uint16_t    mfr2Len;                //   [202] 00 8C          -- Length of manufacturing section 2.
+    uint16_t    mfr2Unk;                //   [200] 00 00          -- Unknown, probably unused.
 #endif
     uint32_t    UNKNOWN0;               //   [204] 00 00 00 00    -- Could be reserved.
 
@@ -290,7 +290,14 @@ typedef struct {
     uint32_t    cfg5;                   //1  [21C] 0   - GEN_CFG_5. g_unknownInitWord3
     uint32_t    UNKNOWN4;               //   [220] 0
     uint32_t    UNKNOWN5;               //   [224] 0
-    uint32_t    UNKNOWN6;               //   [228] 0
+
+#ifdef __LITTLE_ENDIAN__
+    uint16_t    func3PXEVLAN;
+    uint16_t    func2PXEVLAN;
+#else
+    uint16_t    func2PXEVLAN;
+    uint16_t    func3PXEVLAN;
+#endif
 
 #ifdef __LITTLE_ENDIAN__
     uint16_t    pciSubsystemF0GPHY;