diff options
| author | George Liu <liuxiwei@inspur.com> | 2019-09-23 12:29:46 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-24 13:58:20 +0300 |
| commit | 998598716f733d524a036a8102737e160b42cd4c (patch) | |
| tree | a41b9c463f94605ea1d7aec3e8b72cf9484ef047 /meta-inspur/meta-fp5280g2 | |
| parent | 2d2d69e120888988e18f89b884ce93f8f78e0f99 (diff) | |
| download | openbmc-998598716f733d524a036a8102737e160b42cd4c.tar.xz | |
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>
Diffstat (limited to 'meta-inspur/meta-fp5280g2')
3 files changed, 7 insertions, 3 deletions
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 11c52952e..934b328c7 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 2e6b39198..c4ba3ad2c 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 aab99dbe2..c26af4fdc 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 @@ ETHERNET: 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: |