Merge pull request #2 from wistron-corporation/OP940_20190917

Add 2nd MAC address for 2nd NIC
ibm-openbmc · Sep 18, 2019 · 540038a · 540038a
2 parents ee79ca8 + 27360f1
commit 540038a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/defines.hpp b/defines.hpp
@@ -143,11 +143,13 @@ constexpr const char* getKeyword<Keyword::VP>()
  *
  *  BMC       The VPD on the BMC planar, for eg
  *  ETHERNET  The ethernet card on the BMC
+ *  ETHERNET1 The 2nd ethernet card on the BMC
  */
 enum Fru
 {
     BMC,
-    ETHERNET
+    ETHERNET,
+    ETHERNET1
 };
 
 } // namespace vpd

diff --git a/write.cpp b/write.cpp
@@ -13,8 +13,11 @@ namespace vpd
 namespace inventory
 {
 
+// Some systems have two MAC addresses
 static const std::unordered_map<std::string, Fru> supportedFrus = {
-    {"BMC", Fru::BMC}, {"ETHERNET", Fru::ETHERNET}};
+    {"BMC", Fru::BMC},
+    {"ETHERNET", Fru::ETHERNET},
+    {"ETHERNET1", Fru::ETHERNET1}};
 
 void write(const std::string& type, const Store& vpdStore,
            const std::string& path)
@@ -46,6 +49,12 @@ void write(const std::string& type, const Store& vpdStore,
                 break;
             }
 
+            case Fru::ETHERNET1:
+            {
+                writeFru<Fru::ETHERNET1>(vpdStore, path);
+                break;
+            }
+
             default:
                 break;
         }

diff --git a/writefru.yaml b/writefru.yaml
@@ -14,3 +14,9 @@ ETHERNET:
         VINI,B1: MACAddress
         OPFR,B1: MACAddress
     xyz.openbmc_project.Inventory.Item.Ethernet:
+
+ETHERNET1:
+    xyz.openbmc_project.Inventory.Item.NetworkInterface:
+        VINI,B1: MACAddress
+        OPFR,B1: MACAddress
+    xyz.openbmc_project.Inventory.Item.Ethernet: