U-boot inventory update, updated PROPERTY

Updated PROPERTY value in both io_board file to MACAddress
and motherboard to uuid. Updated obmc-sync-inventory-item@.service
input parameters.

Change-Id: I5cc34ff449116d647331656bd81b2e4b07d3ea41
Signed-off-by: Dinesh Chinari <chinari@us.ibm.com>

7 files changed, 14 insertions, 9 deletions

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 46a4f4aeb..5e24fc43a 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
@@ -5,6 +5,9 @@ BMC:
         Manufacturer: OPFR,VN
     xyz.openbmc_project.Inventory.Item:
         PrettyName: VINI,DR
+    xyz.openbmc_project.Common.UUID:
+        UUID: OPFR,UD
+
 
 ETHERNET:
     xyz.openbmc_project.Inventory.Item.NetworkInterface:
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
index aeb3dd31b..3d324a1ea 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-NAMES = "io_board motherboard"
+NAMES = "io_board/bmc/ethernet motherboard"
 ITEMSFMT = "system/chassis/{0}"
 ITEMS_ESCAPEDFMT = "system-chassis-{0}"
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board
deleted file mode 100644
index 5a1d94ac0..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board
+++ /dev/null
@@ -1,4 +0,0 @@
-FRU_TYPE=DAUGHTER_CARD
-FRU_NAME=io_board
-PROPERTY="Custom Field 2"
-SYNC_TYPE=mac
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet
new file mode 100644
index 000000000..722e0e641
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet
@@ -0,0 +1,2 @@
+PROPERTY="MACAddress"
+SYNC_TYPE=mac
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
index bc632f414..95abbc885 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
@@ -1,4 +1,2 @@
-FRU_TYPE=MAIN_PLANAR
-FRU_NAME=motherboard
-PROPERTY="Custom Field 1"
+PROPERTY="UUID"
 SYNC_TYPE=uuid
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
index d33757751..ff61518d6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
@@ -1055,10 +1055,16 @@
             BuildDate:
                IPMIFruSection: Board
                IPMIFruProperty: Mfg Date
+    /system/chassis/io_board/bmc/ethernet:
         xyz.openbmc_project.Inventory.Item.NetworkInterface:
             MACAddress:
                IPMIFruSection: Board
                IPMIFruProperty: Custom Field 2
+        xyz.openbmc_project.Inventory.Item:
+            PrettyName:
+               IPMIFruSection: Board
+               IPMIFruProperty: Name
+
 
 101:
     /system/chassis/sas_expander:
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
index ba3af0557..f9654feed 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
@@ -7,7 +7,7 @@ After=obmc-read-eeprom@%i.service
 Restart=no
 Type=oneshot
 EnvironmentFile={envfiledir}/obmc/sync_inventory_item/%I
-ExecStart=/usr/bin/env sync_inventory_items.py -t $FRU_TYPE -n $FRU_NAME -p ${{PROPERTY}} -s $SYNC_TYPE
+ExecStart=/usr/bin/env sync_inventory_items.py -p ${{PROPERTY}} -s $SYNC_TYPE
 SyslogIdentifier=sync_inventory_items.py
 
 [Install]