openpower: Read the BMC VPD from the OPFR record

The OpenPower part number and serial number should be
coming from the VP and VS keywords in the OPFR record.

Resolves openbmc/openbmc#3174

Tested: Check that the serial and part number fields are
        filled in with valid values in the inventory.

Change-Id: I06109a24518975c54be6bf3ec6feb66b89be100a
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
index b920050..9aa7462 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
@@ -1,7 +1,7 @@
 BMC:
     xyz.openbmc_project.Inventory.Decorator.Asset:
-        VINI,PN: PartNumber
-        VINI,SN: SerialNumber
+        OPFR,VP: PartNumber
+        OPFR,VS: SerialNumber
         OPFR,VN: Manufacturer
     xyz.openbmc_project.Inventory.Item:
         VINI,DR: PrettyName