bcmflash: Default to valid MAC addresses (not multicast addresses). (#162)

3 files changed, 12 insertions, 12 deletions

diff --git a/utils/bcmflash/nvm_blackbird.c b/utils/bcmflash/nvm_blackbird.c
index 9ee44c7..7207294 100644
--- a/utils/bcmflash/nvm_blackbird.c
+++ b/utils/bcmflash/nvm_blackbird.c
@@ -61,7 +61,7 @@ NVRAMInfo2_t gBlackbirdNVRAMInfo2 = {
     .mfr2Len = htobe16(sizeof(NVRAMInfo2_t)), //   [202] 00 8C          -- Length of manufacturing section 2.
     .UNKNOWN0 = 0,                            //   [204] 00 00 00 00    -- Could be reserved.
 
-    .macAddr2 = { htobe32(0x1122), htobe32(0x33445562) },
+    .macAddr2 = { htobe32(0x1022), htobe32(0x33445562) },
 
     .UNKNOWN1 = 0, //   [210] 0
     .UNKNOWN2 = 0, //   [214] 0
@@ -90,7 +90,7 @@ NVRAMInfo2_t gBlackbirdNVRAMInfo2 = {
     .func2CfgFeature = htobe32(0xC5C00000), // 1  [250] C5 C0 00 00 - Function 2 GEN_CFG_1E4.
     .func2CfgHW = htobe32(0x00004014),      // 1  [254] 00 00 40 14 - Function 2 GEN_CFG_2.
 
-    .macAddr3 = { htobe32(0x1122), htobe32(0x33445563) },
+    .macAddr3 = { htobe32(0x1022), htobe32(0x33445563) },
 
     .func3CfgFeature = htobe32(0xC5C00000), // 1  [260] C5 C0 00 00 - Function 3 GEN_CFG_1E4.
     .func3CfgHW = htobe32(0x00004014),      // 1  [264] 00 00 40 14 - Function 3 GEN_CFG_2.
@@ -106,7 +106,7 @@ NVRAMInfo2_t gBlackbirdNVRAMInfo2 = {
 };
 
 NVRAMInfo_t gBlackbirdNVRAMInfo = {
-    .macAddr0 = { htobe32(0x1122), htobe32(0x33445560) },
+    .macAddr0 = { htobe32(0x1022), htobe32(0x33445560) },
     .partNumber = "BCM95719",
     .partRevision = { 'A', '0' },
     .firmwareRevision = 0, /* Placeholder*/
@@ -139,7 +139,7 @@ NVRAMInfo_t gBlackbirdNVRAMInfo = {
     .func0CfgFeature = htobe32(0xC5C00080),
     .func0CfgHW = htobe32(0x00004014),
 
-    .macAddr1 = { htobe32(0x1122), htobe32(0x33445561) },
+    .macAddr1 = { htobe32(0x1022), htobe32(0x33445561) },
     .func1CfgFeature = htobe32(0xC5C00000),
     .func1CfgHW = htobe32(0x00004014),
 
diff --git a/utils/bcmflash/nvm_kh08p.c b/utils/bcmflash/nvm_kh08p.c
index 90a6859..4721f79 100644
--- a/utils/bcmflash/nvm_kh08p.c
+++ b/utils/bcmflash/nvm_kh08p.c
@@ -61,7 +61,7 @@ NVRAMInfo2_t gKH08PNVRAMInfo2 = {
     .mfr2Len = htobe16(sizeof(NVRAMInfo2_t)), //   [202] 00 8C          -- Length of manufacturing section 2.
     .UNKNOWN0 = 0,                            //   [204] 00 00 00 00    -- Could be reserved.
 
-    .macAddr2 = { htobe32(0x1122), htobe32(0x33445568) },
+    .macAddr2 = { htobe32(0x1022), htobe32(0x33445568) },
 
     .UNKNOWN1 = 0, //   [210] 0
     .UNKNOWN2 = 0, //   [214] 0
@@ -90,7 +90,7 @@ NVRAMInfo2_t gKH08PNVRAMInfo2 = {
     .func2CfgFeature = htobe32(0xCDB50202), // 1  [250] C5 C0 00 00 - Function 2 GEN_CFG_1E4.
     .func2CfgHW = htobe32(0x00006014),      // 1  [254] 00 00 40 14 - Function 2 GEN_CFG_2.
 
-    .macAddr3 = { htobe32(0x1122), htobe32(0x33445569) },
+    .macAddr3 = { htobe32(0x1022), htobe32(0x33445569) },
 
     .func3CfgFeature = htobe32(0xCDB50202), // 1  [260] C5 C0 00 00 - Function 3 GEN_CFG_1E4.
     .func3CfgHW = htobe32(0x00006014),      // 1  [264] 00 00 40 14 - Function 3 GEN_CFG_2.
@@ -106,7 +106,7 @@ NVRAMInfo2_t gKH08PNVRAMInfo2 = {
 };
 
 NVRAMInfo_t gKH08PNVRAMInfo = {
-    .macAddr0 = { htobe32(0x1122), htobe32(0x33445566) },
+    .macAddr0 = { htobe32(0x1022), htobe32(0x33445566) },
     .partNumber = "BCM95719",
     .partRevision = { 'A', '0' },
     .firmwareRevision = 0, /* Placeholder*/
@@ -139,7 +139,7 @@ NVRAMInfo_t gKH08PNVRAMInfo = {
     .func0CfgFeature = htobe32(0xCDB50282),
     .func0CfgHW = htobe32(0x00006014),
 
-    .macAddr1 = { htobe32(0x1122), htobe32(0x33445567) },
+    .macAddr1 = { htobe32(0x1022), htobe32(0x33445567) },
     .func1CfgFeature = htobe32(0xCDB50202),
     .func1CfgHW = htobe32(0x00006014),
 
diff --git a/utils/bcmflash/nvm_talos2.c b/utils/bcmflash/nvm_talos2.c
index 1817d81..361f813 100644
--- a/utils/bcmflash/nvm_talos2.c
+++ b/utils/bcmflash/nvm_talos2.c
@@ -61,7 +61,7 @@ NVRAMInfo2_t gTalosIINVRAMInfo2 = {
     .mfr2Len = htobe16(sizeof(NVRAMInfo2_t)), //   [202] 00 8C          -- Length of manufacturing section 2.
     .UNKNOWN0 = 0,                            //   [204] 00 00 00 00    -- Could be reserved.
 
-    .macAddr2 = { htobe32(0x1122), htobe32(0x33445572) },
+    .macAddr2 = { htobe32(0x1022), htobe32(0x33445572) },
 
     .UNKNOWN1 = 0, //   [210] 0
     .UNKNOWN2 = 0, //   [214] 0
@@ -90,7 +90,7 @@ NVRAMInfo2_t gTalosIINVRAMInfo2 = {
     .func2CfgFeature = htobe32(0xC5C00000), // 1  [250] C5 C0 00 00 - Function 2 GEN_CFG_1E4.
     .func2CfgHW = htobe32(0x00004014),      // 1  [254] 00 00 40 14 - Function 2 GEN_CFG_2.
 
-    .macAddr3 = { htobe32(0x1122), htobe32(0x33445573) },
+    .macAddr3 = { htobe32(0x1022), htobe32(0x33445573) },
 
     .func3CfgFeature = htobe32(0xC5C00000), // 1  [260] C5 C0 00 00 - Function 3 GEN_CFG_1E4.
     .func3CfgHW = htobe32(0x00004014),      // 1  [264] 00 00 40 14 - Function 3 GEN_CFG_2.
@@ -106,7 +106,7 @@ NVRAMInfo2_t gTalosIINVRAMInfo2 = {
 };
 
 NVRAMInfo_t gTalosIINVRAMInfo = {
-    .macAddr0 = { htobe32(0x1122), htobe32(0x33445570) },
+    .macAddr0 = { htobe32(0x1022), htobe32(0x33445570) },
     .partNumber = "BCM95719",
     .partRevision = { 'A', '0' },
     .firmwareRevision = 0, /* Placeholder*/
@@ -139,7 +139,7 @@ NVRAMInfo_t gTalosIINVRAMInfo = {
     .func0CfgFeature = htobe32(0xC5C00080),
     .func0CfgHW = htobe32(0x00004014),
 
-    .macAddr1 = { htobe32(0x1122), htobe32(0x33445571) },
+    .macAddr1 = { htobe32(0x1022), htobe32(0x33445571) },
     .func1CfgFeature = htobe32(0xC5C00000),
     .func1CfgHW = htobe32(0x00004014),