sync MAC from VPD to shared NIC
There are two MACs on the fp5280g2 machine.
eth0 is the shared NIC and eth1 is the dedicated NIC.
Testd: Correctly read MAC for eth0 and eth1 from eeprom and expose it to D-BUS interface.
(From meta-inspur rev: 18417299bbe04a1728ff58f588f26c6a16d06bb8)
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Id2c7a9551e5c0fc2115a7021a103095439dc242f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend
index 11c5295..934b328 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend
@@ -1 +1 @@
-SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth1.service"
+SYSTEMD_SERVICE_${PN} += " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory
index 2e6b391..c4ba3ad 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory
@@ -1,3 +1,3 @@
-FRUS=BMC,ETHERNET
-PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/ethernet
+FRUS=BMC,ETHERNET,ETHERNET1
+PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1
EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a080.i2c-bus/i2c-1/1-0050/eeprom
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml
index aab99db..c26af4f 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml
@@ -10,3 +10,7 @@
xyz.openbmc_project.Inventory.Item.NetworkInterface:
OPFR,B1: MACAddress
xyz.openbmc_project.Inventory.Item.Ethernet:
+ETHERNET1:
+ xyz.openbmc_project.Inventory.Item.NetworkInterface:
+ VINI,B1: MACAddress
+ xyz.openbmc_project.Inventory.Item.Ethernet: