IPMI FRU Updates

Change-Id: Iab7684e1ab89cc29311d6882206952bb2966e4e4
RTC:119680
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15860
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

12 files changed, 576 insertions, 326 deletions

diff --git a/src/include/usr/ipmi/ipmifruinv.H b/src/include/usr/ipmi/ipmifruinv.H
index cc34b06e3..0df72462b 100644
--- a/src/include/usr/ipmi/ipmifruinv.H
+++ b/src/include/usr/ipmi/ipmifruinv.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/include/usr/ipmi/ipmifru.H $                              */
+/* $Source: src/include/usr/ipmi/ipmifruinv.H $                           */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -32,10 +32,44 @@ namespace IPMIFRUINV
      * @brief Base function to be called to set the IPMI Fru
      *     inventory data for all targets in system
      *
-     * @param[out] errlHndl_t, Any errors encountered sending
-     *             IPMI Fru Inventory Data
+     * @param[in]  updateData, Boolean indicating whether the data
+     *             is being updated. If false, this function will send
+     *             all the IPMI FRU Data. If True, it will only send
+     *             updated data for procs/centaurs.
      */
-    errlHndl_t setData(void);
+    void setData(bool i_updateData=false);
+
+    /**
+     * @brief Clears fru data from BMC
+     * @param[in] fruId, The fruId to be cleared
+     */
+    void clearData(uint8_t i_fruId);
+
+    /**
+     * @brief Gathers potential list of frus who may need their fru
+     *        data cleared from the BMC
+     * @param[in] pSys, Top level system target
+     * @param[in/out] frusToClear, Map of potential frus to clear
+     */
+    void gatherClearData(const TARGETING::Target* i_pSys,
+                                    std::map<uint8_t,bool>& io_frusToClear);
+
+    /**
+     * @brief Updates vector of potential frus to set inventory
+     *        data for. Updates map of frus that need their
+     *        fru inventory data cleared.
+     * @param[in] pSys, Top level system target
+     * @param[in/out] frusToClear, Map of potential frus to clear
+     * @param[in] updateData, Bool indicating the data is being updated
+     *            True - Doing an update to previously set data
+     *            False - Setting base data
+     */
+    void gatherSetData(const TARGETING::Target* i_pSys,
+                                  std::map<uint8_t,bool>& io_frusToClear,
+                   std::vector< std::pair<TARGETING::TargetHandle_t, uint8_t> >&
+                                                               io_potentialFrus,
+                                  bool i_updateData);
+
 };
 
 #endif
diff --git a/src/include/usr/vpd/cvpdenums.H b/src/include/usr/vpd/cvpdenums.H
index 53bfcb27b..4b5adb271 100644
--- a/src/include/usr/vpd/cvpdenums.H
+++ b/src/include/usr/vpd/cvpdenums.H
@@ -45,6 +45,7 @@ namespace CVPD
         OPFR        = 0x05,
         VNDR        = 0x06,
         SPDX        = 0x07,
+        OSYS        = 0x08,
         // Last Record
         CVPD_LAST_RECORD,
         CVPD_TEST_RECORD,   // Test purposes ONLY!
@@ -120,6 +121,9 @@ namespace CVPD
         K6          = 0x39,
         K7          = 0x3a,
         K8          = 0x3b,
+        MM          = 0x3c,
+        SS          = 0x3d,
+        ET          = 0x3e,
 
         // Last Keyword
         CVPD_LAST_KEYWORD,
diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C
index 55d2485c1..8548989a7 100644
--- a/src/usr/devtree/bld_devtree.C
+++ b/src/usr/devtree/bld_devtree.C
@@ -1437,6 +1437,15 @@ errlHndl_t bld_fdt_bmc(devTree * i_dt, bool i_smallTree)
 
     i_dt->addPropertyString(bmcNode, "name", bmcNodeName );
 
+    //Pass Opal their device string
+    // find CLASS_SYS (the top level target)
+    TARGETING::Target* pSys;
+    TARGETING::targetService().getTopLevelTarget(pSys);
+    assert(pSys != NULL,
+               "bld_fdt_bmc - Error: Could not find the top level target.");
+    i_dt->addPropertyCell32(bmcNode, "fruId",
+                                   pSys->getAttr<TARGETING::ATTR_FRU_ID>());
+
     /* create a node to hold the sensors */
     errhdl = bld_fdt_sensors( i_dt, bmcNode, i_smallTree );
 
diff --git a/src/usr/hwas/hostbootIstep.C b/src/usr/hwas/hostbootIstep.C
index 23e9d9f49..aac405105 100644
--- a/src/usr/hwas/hostbootIstep.C
+++ b/src/usr/hwas/hostbootIstep.C
@@ -186,14 +186,11 @@ void* host_discover_targets( void *io_pArgs )
     }
 
 #ifdef CONFIG_BMC_IPMI
+    // Gather + Send the base IPMI Fru Inventory data to the BMC
+    IPMIFRUINV::setData();
+
     // send DIMM/CORE/PROC sensor status to the BMC
     SENSOR::updateBMCSensorStatus();
-
-    if (errl == NULL)
-    {
-        // Gather + Send the IPMI Fru Inventory data to the BMC
-        errl = IPMIFRUINV::setData();
-    }
 #endif
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.C b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
index d1987d8b1..99ee702f7 100644
--- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C
+++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -77,6 +79,7 @@
 #include    <pbusLinkSvc.H>
 #include    <ibscom/ibscomif.H>
 #include    <config.h>
+#include <ipmi/ipmifruinv.H>
 
 namespace   DMI_TRAINING
 {
@@ -317,6 +320,11 @@ void*    call_mss_getecid( void *io_pArgs )
                    "SUCCESS :  mss_get_cen_ecid HWP( )" );
     }
 
+    #ifdef CONFIG_BMC_IPMI
+        // Gather + Send the IPMI Fru Inventory data to the BMC
+        IPMIFRUINV::setData(true);
+    #endif
+
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_getecid exit" );
 
     // end task, returning any errorlogs to IStepDisp
diff --git a/src/usr/ipmi/ipmifruinv.C b/src/usr/ipmi/ipmifruinv.C
index 5981fd5e0..7c9eb853a 100644
--- a/src/usr/ipmi/ipmifruinv.C
+++ b/src/usr/ipmi/ipmifruinv.C
@@ -24,19 +24,33 @@
 /* IBM_PROLOG_END_TAG                                                     */
 
 #include <vector>
+#include <map>
 #include <vpd/mvpdenums.H>
 #include <devicefw/userif.H>
 #include <vpd/spdenums.H>
 #include <vpd/cvpdenums.H>
+#include <targeting/common/commontargeting.H>
+#include <targeting/common/utilFilter.H>
+#include <errl/errlmanager.H>
 #include <ipmi/ipmifruinv.H>
 #include "ipmifru.H"
 #include "ipmifruinvprvt.H"
-#include <targeting/common/commontargeting.H>
-#include <targeting/common/utilFilter.H>
-
 
 extern trace_desc_t * g_trac_ipmi;
 
+
+/**
+ * @brief Compairs two pairs - used for std:sort
+ * @param[in] lhs - left pair for comparison
+ * @param[in] rhs - right pair for comparison
+ */
+inline static bool comparePairs(
+              const std::pair<TARGETING::TargetHandle_t, uint8_t>& i_lhs,
+              const std::pair<TARGETING::TargetHandle_t, uint8_t>& i_rhs)
+{
+        return (i_lhs.second < i_rhs.second);
+}
+
 IpmiFruInv::IpmiFruInv(TARGETING::TargetHandle_t i_target)
     :iv_target(i_target)
 {
@@ -46,26 +60,32 @@ IpmiFruInv::~IpmiFruInv()
 {}
 
 
-IpmiFruInv *IpmiFruInv::Factory(TARGETING::TargetHandle_t i_target)
+IpmiFruInv *IpmiFruInv::Factory(TARGETING::TargetHandleList i_targets,
+                                bool i_updateData)
 {
     IpmiFruInv *l_fru = NULL;
+    TARGETING::TargetHandle_t l_target;
+
+    assert( ! i_targets.empty(),
+                "IpmiFruInv::Factory: Input was empty List of Targets");
+    l_target = i_targets[0];
 
-    switch (i_target->getAttr<TARGETING::ATTR_TYPE>())
+    switch (l_target->getAttr<TARGETING::ATTR_TYPE>())
     {
         case TARGETING::TYPE_DIMM:
-            l_fru = new isdimmIpmiFruInv(i_target);
+            l_fru = new isdimmIpmiFruInv(l_target);
             break;
         case TARGETING::TYPE_PROC:
-            l_fru = new procIpmiFruInv(i_target);
+            l_fru = new procIpmiFruInv(l_target, i_updateData);
             break;
         case TARGETING::TYPE_MEMBUF:
             // @todo-RTC:117702
-            l_fru = new backplaneIpmiFruInv(i_target);
+            l_fru = new backplaneIpmiFruInv(l_target, i_targets, i_updateData);
             break;
         default:
-            TRACFCOMP(g_trac_ipmi,"IpmiFruInv::Factory: No support for target type given: [%08x]",
-                       i_target->getAttr<TARGETING::ATTR_TYPE>());
-            assert(false);
+            assert(false,
+                "IpmiFruInv::Factory: No support for target type given: [%08x]",
+                       l_target->getAttr<TARGETING::ATTR_TYPE>());
             break;
     }
 
@@ -76,7 +96,7 @@ void IpmiFruInv::sendFruData(uint8_t i_deviceId)
 {
     if (iv_record_data.size() > 0)
     {
-        //Use IMPIFRU::writeData to sand data to service processor
+        //Use IMPIFRU::writeData to send data to service processor
         // it will do any error handling and memory management
         IPMIFRU::writeData(i_deviceId, &iv_record_data[0],
                          iv_record_data.size(), IPMIFRUINV::DEFAULT_FRU_OFFSET);
@@ -226,12 +246,15 @@ errlHndl_t IpmiFruInv::buildEmptyArea(std::vector<uint8_t> &i_data)
 // so padding is needed to make records properly formatted
 void IpmiFruInv::padData(std::vector<uint8_t> &io_data)
 {
+    uint8_t l_pad_remainder = (io_data.size() + IPMIFRUINV::CHECKSUM_SIZE) %
+                          IPMIFRUINV::RECORD_UNIT_OF_MEASUREMENT;
 
-    io_data.insert(io_data.end(),
-                   ((io_data.size() + IPMIFRUINV::CHECKSUM_SIZE) %
-                          IPMIFRUINV::RECORD_UNIT_OF_MEASUREMENT),
-                   uint8_t(0));
-
+    if (l_pad_remainder)
+    {
+        io_data.insert(io_data.end(),
+                       IPMIFRUINV::RECORD_UNIT_OF_MEASUREMENT - l_pad_remainder,
+                       uint8_t(0));
+    }
     return;
 }
 
@@ -312,7 +335,7 @@ void IpmiFruInv::postFormatProcessing(std::vector<uint8_t> &io_data)
     //This area needs to be padded to a multiple of 8 bytes (after checksum)
     padData(io_data);
 
-    //Set size of board info area
+    //Set size of data info area
     setAreaSize(io_data, 1);
 
     //Finally add board info checksum
@@ -324,6 +347,7 @@ void IpmiFruInv::postFormatProcessing(std::vector<uint8_t> &io_data)
 //Helper function containing the logic to set the proper size of a data section
 void IpmiFruInv::setAreaSize(std::vector<uint8_t> &io_data, uint8_t i_offset)
 {
+
     io_data.at(i_offset) = (io_data.size() + IPMIFRUINV::CHECKSUM_SIZE)
                              / IPMIFRUINV::RECORD_UNIT_OF_MEASUREMENT;
 
@@ -417,7 +441,7 @@ errlHndl_t isdimmIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
 
     do {
         //First get size with NULL call:
-        errlHndl_t l_errl = deviceRead(iv_target,
+        l_errl = deviceRead(iv_target,
                                        NULL,
                                        l_vpdSize,
                                        DEVICE_SPD_ADDRESS(i_keyword));
@@ -434,17 +458,17 @@ errlHndl_t isdimmIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
 
         if (l_vpdSize > 0)
         {
-            uint8_t l_vDataPtr[l_vpdSize];
-            l_errl = deviceRead(iv_target, l_vDataPtr, l_vpdSize,
-                                DEVICE_SPD_ADDRESS(i_keyword));
+            //Determine how big data is and expand it to handle the soon to
+            //be read VPD data
+            uint8_t l_offset = io_data.size();
+            io_data.resize(l_offset + 1 + l_vpdSize);
 
-            //First append data size to vector data
-            io_data.push_back(l_vpdSize);
-
-            //Second append all data found onto vector data
-            io_data.insert(io_data.end(),
-                                   &l_vDataPtr[0], &l_vDataPtr[l_vpdSize]);
+            //Add on the data to the type/length byte indicating it is binary
+            io_data.at(l_offset) = l_vpdSize;
 
+            //Read the VPD data directly into fru inventory data buffer
+            l_errl = deviceRead(iv_target,&io_data[l_offset+1], l_vpdSize,
+                        DEVICE_SPD_ADDRESS(i_keyword));
         }
         else
         {
@@ -463,10 +487,11 @@ errlHndl_t isdimmIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
 }
 
 //##############################################################################
-procIpmiFruInv::procIpmiFruInv( TARGETING::TargetHandle_t i_target )
-    :IpmiFruInv(i_target)
+procIpmiFruInv::procIpmiFruInv( TARGETING::TargetHandle_t i_target,
+                                bool i_isUpdate )
+    :IpmiFruInv(i_target),
+    iv_isUpdate(i_isUpdate)
 {
-
 };
 
 errlHndl_t procIpmiFruInv::buildInternalUseArea(std::vector<uint8_t> &io_data)
@@ -501,9 +526,9 @@ errlHndl_t procIpmiFruInv::buildBoardInfoArea(std::vector<uint8_t> &io_data)
         // - add together and the value for this byte is 0xC3
         io_data.push_back(0xC3);
         // - Now put in 'IBM'
-        io_data.push_back(0x49); //I
-        io_data.push_back(0x42); //B
-        io_data.push_back(0x4D); //M
+        io_data.push_back('I');
+        io_data.push_back('B');
+        io_data.push_back('M');
 
         //Set Board Info description
         l_errl = addVpdData(io_data, MVPD::VINI, MVPD::DR, true);
@@ -517,6 +542,25 @@ errlHndl_t procIpmiFruInv::buildBoardInfoArea(std::vector<uint8_t> &io_data)
         //Set Board FRU File ID
         l_errl = addVpdData(io_data, MVPD::VINI, MVPD::VZ);
         if (l_errl) { break; }
+
+        //Push Fru File ID Byte - NULL
+        io_data.push_back(IPMIFRUINV::TYPELENGTH_BYTE_NULL);
+
+        //Get ECID Data
+        TARGETING::ATTR_ECID_type ecidInfo;
+        bool getEcid = iv_target->tryGetAttr<TARGETING::ATTR_ECID>(ecidInfo);
+        //Only add ECID Data if in an update scenario
+        if (getEcid && iv_isUpdate == true)
+        {
+            addEcidData(iv_target, ecidInfo, io_data);
+        }
+        else
+        {
+            //Indicate no custom fields if ecid data not found
+            io_data.push_back(IPMIFRUINV::TYPELENGTH_BYTE_NULL);
+        }
+
+        //Indicate end of custom fields
         io_data.push_back(IPMIFRUINV::END_OF_CUSTOM_FIELDS);
 
         //Complete formatting for this data record
@@ -557,7 +601,7 @@ errlHndl_t procIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
     do {
 
         //First get size of data by passing NULL
-        errlHndl_t l_errl = deviceRead(iv_target,
+        l_errl = deviceRead(iv_target,
                                       NULL,
                                       l_vpdSize,
                                       DEVICE_MVPD_ADDRESS(i_record, i_keyword));
@@ -574,28 +618,26 @@ errlHndl_t procIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
 
         if (l_vpdSize > 0)
         {
-            uint8_t l_vDataPtr[l_vpdSize];
-
-            l_errl = deviceRead(iv_target, l_vDataPtr, l_vpdSize,
-                                DEVICE_MVPD_ADDRESS(i_record, i_keyword));
+            //Determine how big data is and expand it to handle the soon to
+            //be read VPD data
+            uint8_t l_offset = io_data.size();
+            io_data.resize(l_offset + 1 + l_vpdSize);
 
             //Add on the data to the type/length byte indicating it is ascii
             // otherwise leave it as binary
             if (i_ascii)
             {
-                io_data.push_back(l_vpdSize
-                                          + IPMIFRUINV::TYPELENGTH_BYTE_ASCII);
+                io_data.at(l_offset) = l_vpdSize
+                                       + IPMIFRUINV::TYPELENGTH_BYTE_ASCII;
             }
             else
             {
-                //First push back the size of this data
-                io_data.push_back(l_vpdSize);
+                io_data.at(l_offset) = l_vpdSize;
             }
 
-            //Second append all data found onto vector data
-            io_data.insert(io_data.end(),
-                                   &l_vDataPtr[0], &l_vDataPtr[l_vpdSize]);
-
+            //Read the VPD data directly into fru inventory data buffer
+            l_errl = deviceRead(iv_target,&io_data[l_offset+1],l_vpdSize,
+                                DEVICE_MVPD_ADDRESS(i_record, i_keyword));
         }
         else
         {
@@ -614,10 +656,13 @@ errlHndl_t procIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
 
 
 //##############################################################################
-backplaneIpmiFruInv::backplaneIpmiFruInv( TARGETING::TargetHandle_t i_target )
-    :IpmiFruInv(i_target)
+backplaneIpmiFruInv::backplaneIpmiFruInv( TARGETING::TargetHandle_t i_target,
+                                     TARGETING::TargetHandleList i_extraTargets,
+                                     bool i_isUpdate)
+    :IpmiFruInv(i_target),
+    iv_isUpdate(i_isUpdate),
+    iv_extraTargets(i_extraTargets)
 {
-
 };
 
 errlHndl_t backplaneIpmiFruInv::buildInternalUseArea(
@@ -634,18 +679,48 @@ errlHndl_t backplaneIpmiFruInv::buildChassisInfoArea(
 
     do {
         //Set formatting data that goes at the beginning of the record
-        preFormatProcessing(io_data, true);
-
-        //Set default chassis type
-        io_data.push_back(IPMIFRUINV::DEFAULT_CHASSIS_TYPE);
-        //Set chassis part number - ascii formatted field
+        preFormatProcessing(io_data, false);
+        //Set Chassis Enclosure Type - Not Ascii
+        // Also, do not include type/length byte
         //@fixme RTC Story 118373
-        l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VP, true);
-        if (l_errl) { break; }
-        //Set chassis serial number - ascii formatted field
-        //@fixme RTC Story 118373
-        l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VS, true);
-        if (l_errl) { break; }
+        l_errl = addVpdData(io_data, CVPD::OSYS, CVPD::ET, false, false);
+
+        //Support Legacy VPD without OSYS record
+        if (l_errl)
+        {
+            TRACFCOMP(g_trac_ipmi,"backplaneIpmiFruInv::buildChassisInfoArea - "
+                      " Using Legacy Chassis VPD Data");
+            //Delete errorlog and use Default data and Legacy VPD Fields
+            delete l_errl;
+            l_errl = NULL;
+
+            //Set default chassis type
+            io_data.push_back(IPMIFRUINV::DEFAULT_CHASSIS_TYPE);
+            //Set chassis part number - ascii formatted field
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VP, true);
+            if (l_errl) { break; }
+            //Set chassis serial number - ascii formatted field
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VS, true);
+            if (l_errl) { break; }
+        }
+        else
+        {
+            TRACFCOMP(g_trac_ipmi,"backplaneIpmiFruInv::buildChassisInfoArea - "
+                      " Using NEW OSYS RECORD FOR Chassis VPD Data");
+
+            //Set chassis part number - ascii formatted field
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OSYS, CVPD::MM, true);
+            if (l_errl) { break; }
+
+            //Set chassis serial number - ascii formatted field
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OSYS, CVPD::SS, true);
+            if (l_errl) { break; }
+
+        }
 
         //Indicate no custom fields
         io_data.push_back(IPMIFRUINV::TYPELENGTH_BYTE_NULL);
@@ -682,23 +757,89 @@ errlHndl_t backplaneIpmiFruInv::buildBoardInfoArea(
         //@fixme RTC Story 118373
         l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VN, true);
         if (l_errl) { break; }
+
         //Set Product Name - ascii formatted data
         //@fixme RTC Story 118373
-        l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::DR, true);
-        if (l_errl) { break; }
-        //Set Product Part number - ascii formatted data
-        //@fixme RTC Story 118373
-        l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VS, true);
-        if (l_errl) { break; }
-        //Set Product Serial number - ascii formatted data
-        //@fixme RTC Story 118373
-        l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VP, true);
+        l_errl = addVpdData(io_data, CVPD::OSYS, CVPD::DR, true);
+
+        //Support Legacy VPD without OSYS record
+        if (l_errl)
+        {
+
+            TRACFCOMP(g_trac_ipmi,
+                      "backplaneIpmiFruInv::buildChassisBoardInfoArea - "
+                      " Using Legacy Chassis VPD Data without OSYS record");
+
+            //Delete errorlog and use Legacy VPD Fields
+            delete l_errl;
+            l_errl = NULL;
+            //Set Product Name - ascii formatted data
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::DR, true);
+            if (l_errl) { break; }
+
+            //Set Product Serial number - ascii formatted data
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VS, true);
+            if (l_errl) { break; }
+
+            //Set Product Part number - ascii formatted data
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OPFR, CVPD::VP, true);
+            if (l_errl) { break; }
 
-        //Indicate No Custom Fields
+        }
+        else
+        {
+            //Set serial number - ascii formatted field
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OSYS, CVPD::SS, true);
+            if (l_errl) { break; }
+
+            //Set chassis part number - ascii formatted field
+            //@fixme RTC Story 118373
+            l_errl = addVpdData(io_data, CVPD::OSYS, CVPD::MM, true);
+            if (l_errl) { break; }
+        }
+
+        //Push Fru File ID Byte - NULL
         io_data.push_back(IPMIFRUINV::TYPELENGTH_BYTE_NULL);
+
+        bool l_setCustomData = false;
+        // Check if we should add ECID
+        for (TARGETING::TargetHandleList::const_iterator extraTargets_it =
+                iv_extraTargets.begin();
+                extraTargets_it != iv_extraTargets.end();
+                ++extraTargets_it
+            )
+        {
+            TARGETING::TargetHandle_t l_extraTarget = *extraTargets_it;
+
+            //Only set the ECID Data during an update scenario
+            if (iv_isUpdate == true &&
+                (l_extraTarget->getAttr<TARGETING::ATTR_TYPE>() ==
+                                                        TARGETING::TYPE_MEMBUF))
+            {
+                TARGETING::ATTR_ECID_type ecidInfo;
+                bool getEcid =
+                      l_extraTarget->tryGetAttr<TARGETING::ATTR_ECID>(ecidInfo);
+                if (getEcid)
+                {
+                    l_setCustomData = true;
+                    addEcidData(l_extraTarget, ecidInfo, io_data);
+                }
+            }
+        }
+
+        //If no Custom data was sent, an Empty Byte is needed
+        if (!l_setCustomData)
+        {
+            io_data.push_back(IPMIFRUINV::TYPELENGTH_BYTE_NULL);
+        }
+        //Indicate End of Custom Fields
         io_data.push_back(IPMIFRUINV::END_OF_CUSTOM_FIELDS);
 
-        ////Complete record data formatting
+        //Complete record data formatting
         postFormatProcessing(io_data);
 
     } while (0);
@@ -729,14 +870,15 @@ errlHndl_t backplaneIpmiFruInv::buildMultiRecordInfoArea(
 errlHndl_t backplaneIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
                                      uint8_t i_record,
                                      uint8_t i_keyword,
-                                     bool i_ascii)
+                                     bool i_ascii,
+                                     bool i_typeLengthByte)
 {
     size_t     l_vpdSize = 0;
     errlHndl_t l_errl = NULL;
 
     do {
         //First get size of data with NULL parameter
-        errlHndl_t l_errl = deviceRead(iv_target,
+        l_errl = deviceRead(iv_target,
                                       NULL,
                                       l_vpdSize,
                                       //@fixme RTC Story 118373
@@ -754,26 +896,37 @@ errlHndl_t backplaneIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
 
         if (l_vpdSize > 0)
         {
-            uint8_t l_vDataPtr[l_vpdSize];
-            l_errl = deviceRead(iv_target, l_vDataPtr, l_vpdSize,
-                                DEVICE_CVPD_ADDRESS(i_record, i_keyword));
-
-            //Add on the data to the type/length byte indicating it is ascii
-            // otherwise leave it as binary
-            if (i_ascii)
+            uint8_t l_offset = 0;
+            //Add on the typelength byte if requested
+            if (i_typeLengthByte)
             {
-                io_data.push_back(l_vpdSize
-                                       + IPMIFRUINV::TYPELENGTH_BYTE_ASCII);
+                //Determine how big data is and expand it to handle the soon to
+                //be read VPD data
+                l_offset = io_data.size();
+                io_data.resize(l_offset + 1 + l_vpdSize);
+                //Add on the data to the type/length byte indicating it is ascii
+                // otherwise leave it as binary
+                if (i_ascii)
+                {
+                    io_data.at(l_offset) = l_vpdSize
+                                           + IPMIFRUINV::TYPELENGTH_BYTE_ASCII;
+                }
+                else
+                {
+                    io_data.at(l_offset) = l_vpdSize;
+                }
+                l_offset += 1;
             }
             else
             {
-                //First addon the size of this data
-                io_data.push_back(l_vpdSize);
+                //Determine how big data is and expand it to handle the soon to
+                //be read VPD data
+                l_offset = io_data.size();
+                io_data.resize(l_offset + l_vpdSize);
             }
-
-            //Then add on the data returned from the VPD read
-            io_data.insert(io_data.end(),
-                                   &l_vDataPtr[0], &l_vDataPtr[l_vpdSize]);
+            //Read the VPD data directly into fru inventory data buffer
+            l_errl = deviceRead(iv_target,&io_data[l_offset],l_vpdSize,
+                                     DEVICE_CVPD_ADDRESS(i_record, i_keyword));
         }
         else
         {
@@ -791,7 +944,47 @@ errlHndl_t backplaneIpmiFruInv::addVpdData(std::vector<uint8_t> &io_data,
     return l_errl;
 }
 
-errlHndl_t IPMIFRUINV::setData()
+void IpmiFruInv::addEcidData(const TARGETING::TargetHandle_t& i_target,
+                             const TARGETING::ATTR_ECID_type& i_ecidInfo,
+                             std::vector<uint8_t> &io_data)
+{
+    // Create Custom ECID Field
+    // - First put in 'ECID:' to make it obvious what this is
+    uint8_t l_data[] = {IPMIFRUINV::TYPELENGTH_BYTE_ASCII + 5,'E','C','I','D',
+                                   ':', IPMIFRUINV::TYPELENGTH_BYTE_NULL + 16};
+
+    // @todo-RTC:124687 - Refactor multiple reallocations
+    io_data.insert( io_data.end(),
+                    &l_data[0],
+                    &l_data[0] + (uint8_t(sizeof(l_data) / sizeof(uint8_t))));
+
+    uint8_t* l_vDataPtr = (uint8_t*) &i_ecidInfo[0];
+    //Insert first 64 bits of ECID data
+    io_data.insert(io_data.end(),
+                &l_vDataPtr[0], &l_vDataPtr[0]+8);
+    l_vDataPtr = (uint8_t*) &i_ecidInfo[1];
+    //Insert second 64 bits of ECID data
+    io_data.insert(io_data.end(),
+        &l_vDataPtr[0], &l_vDataPtr[0]+8);
+
+    return;
+}
+
+void IPMIFRUINV::clearData(uint8_t i_fruId)
+{
+    uint8_t l_clearData[] =
+        {IPMIFRUINV::RECORD_NOT_PRESENT, IPMIFRUINV::RECORD_NOT_PRESENT,
+         IPMIFRUINV::RECORD_NOT_PRESENT, IPMIFRUINV::RECORD_NOT_PRESENT,
+         IPMIFRUINV::RECORD_NOT_PRESENT, IPMIFRUINV::RECORD_NOT_PRESENT,
+         IPMIFRUINV::RECORD_NOT_PRESENT, IPMIFRUINV::RECORD_NOT_PRESENT};
+
+    //Use IMPIFRU::writeData to send data to service processor
+    IPMIFRU::writeData(i_fruId, l_clearData,
+                        IPMIFRUINV::COMMON_HEADER_FORMAT_SIZE,
+                        IPMIFRUINV::DEFAULT_FRU_OFFSET);
+}
+
+void IPMIFRUINV::setData(bool i_updateData)
 {
     errlHndl_t l_errl = NULL;
 
@@ -808,57 +1001,192 @@ errlHndl_t IPMIFRUINV::setData()
             break;
         }
 
-        // Find list of all target types that may need a fru inventory
-        // record created for them
-        TARGETING::PredicateCTM predChip(TARGETING::CLASS_CHIP);
-        TARGETING::PredicateCTM predDimm(TARGETING::CLASS_LOGICAL_CARD,
+        //Container with list of frus and a boolean indicating whether the data
+        //needs to be cleared or not
+        // @todo-RTC:124687 - Refactor map use
+        std::map<uint8_t,bool> frusToClear;
+        //List of all potential Frus that could need IPMI Fru Inv. Data Sent
+        std::vector< std::pair<TARGETING::TargetHandle_t, uint8_t> >
+                                                                l_potentialFrus;
+
+        if (i_updateData == false)
+        {
+            IPMIFRUINV::gatherClearData(pSys, frusToClear);
+        }
+
+        // Find list of all target types that may need a fru inv. record set
+        IPMIFRUINV::gatherSetData(pSys, frusToClear,
+                                     l_potentialFrus, i_updateData);
+
+        //Now Loop through all TargetHandle_t, uint8_t pairs to see if there are
+        //multiple targets with the same fruId. These will be formed into a list
+        //as data from all Targets will be combined into one IPMI Fru Inventory
+        //Record under the same fruId.
+        std::vector<std::pair<TARGETING::TargetHandle_t,uint8_t> >::iterator
+                                                                        l_iter;
+
+        for (l_iter = l_potentialFrus.begin(); l_iter != l_potentialFrus.end();
+                   ++l_iter)
+        {
+            //iterators to walk list and group frus together
+            std::vector<std::pair<TARGETING::TargetHandle_t,uint8_t> >::iterator
+                                                             l_curPair = l_iter;
+            std::vector<std::pair<TARGETING::TargetHandle_t,uint8_t> >::iterator
+                                                            l_nextPair = l_iter;
+
+            //The 'base' TargetHandleList will have one FRU
+            TARGETING::TargetHandleList l_curFru;
+            l_curFru.push_back(l_curPair->first);
+            //This will be the fruId to compare with what comes after this
+            //Target in the vector
+            uint8_t l_fruId = l_curPair->second;
+
+            TRACFCOMP(g_trac_ipmi, "IPMIFRUINV::setData - Collecting all IPMI FRU Inventory Targets with fruId: [%08x]",
+                        l_fruId);
+
+            ++l_nextPair;
+            for( ; l_nextPair != l_potentialFrus.end()
+                            && l_nextPair->second == l_fruId; ++l_nextPair)
+            {
+                l_curFru.push_back(l_nextPair->first);
+                l_iter = l_nextPair;
+            }
+            IpmiFruInv *l_fru = IpmiFruInv::Factory(l_curFru, i_updateData);
+
+            if (l_fru != NULL)
+            {
+                //Target recognized, build & send IPMI FRU Invenotry record
+                l_errl = l_fru->buildFruInvRecord();
+                if (l_errl)
+                {
+                    TRACFCOMP(g_trac_ipmi, "IPMIFRUINV::setData - Errors encountered, will skip setting the rest of the data");
+                    break;
+                }
+                TRACFCOMP(g_trac_ipmi, "IPMIFRUINV::setData - Sending IPMI FRU Inventory Data for target with fruId: [%08x] and size [%08x]",
+                         l_fruId, l_curFru.size());
+                l_fru->sendFruData(l_fruId);
+                delete l_fru;
+            }
+        }
+
+        //Do not clear data during a data update
+        if (i_updateData == false)
+        {
+            //Now clear any FRU Data for fruIds that didn't have data set. This
+            //will handle the case where something was removed from the system
+            for (std::map<uint8_t,bool>::iterator it=frusToClear.begin();
+                    it!=frusToClear.end();
+                    ++it)
+            {
+                //If the bool is true its data needs to be cleared
+                if (it->second == true)
+                {
+                    IPMIFRUINV::clearData(it->first);
+                }
+            }
+        }
+
+    } while(0);
+
+    if (l_errl)
+    {
+        //Commit errorlog encountered indicating there were issues
+        //setting the FRU Inventory Data
+        TRACFCOMP(g_trac_ipmi, "Errors encountered setting Fru Inventory Data");
+        l_errl->collectTrace(IPMI_COMP_NAME);
+        errlCommit(l_errl, IPMI_COMP_ID);
+    }
+    return;
+}
+
+
+void IPMIFRUINV::gatherClearData(const TARGETING::Target* i_pSys,
+                                    std::map<uint8_t,bool>& io_frusToClear)
+{
+    TARGETING::PredicateCTM predChip(TARGETING::CLASS_CHIP);
+    TARGETING::PredicateCTM predDimm(TARGETING::CLASS_LOGICAL_CARD,
                                          TARGETING::TYPE_DIMM);
-        TARGETING::PredicatePostfixExpr checkExpr;
-        TARGETING::PredicateHwas l_present;
-        l_present.present(true);
+    TARGETING::PredicatePostfixExpr checkAllExpr;
+    checkAllExpr.push(&predChip).push(&predDimm).Or();
+    TARGETING::TargetHandleList l_allPossibleFrus;
+    TARGETING::targetService().getAssociated( l_allPossibleFrus, i_pSys,
+    TARGETING::TargetService::CHILD, TARGETING::TargetService::ALL,
+            &checkAllExpr );
+
+    for (TARGETING::TargetHandleList::const_iterator pTarget_it =
+         l_allPossibleFrus.begin();
+         pTarget_it != l_allPossibleFrus.end();
+         ++pTarget_it)
+    {
+        TARGETING::TargetHandle_t pTarget = *pTarget_it;
+        uint32_t l_fruId = pTarget->getAttr<TARGETING::ATTR_FRU_ID>();
+
+        if (l_fruId)
+        {
+            //Assume we clear all possible targets to start
+            // @todo-RTC:124506 - New logic may be needed to clear all targets
+            // after a code update
+            io_frusToClear[l_fruId] = true;
+        }
+    }
+
+    return;
+}
+
+void IPMIFRUINV::gatherSetData(const TARGETING::Target* i_pSys,
+                                  std::map<uint8_t,bool>& io_frusToClear,
+                   std::vector< std::pair<TARGETING::TargetHandle_t, uint8_t> >&
+                                                               io_potentialFrus,
+                                  bool i_updateData)
+{
+    TARGETING::PredicateCTM predChip(TARGETING::CLASS_CHIP);
+    TARGETING::PredicateCTM predDimm(TARGETING::CLASS_LOGICAL_CARD,
+                                     TARGETING::TYPE_DIMM);
+    TARGETING::PredicatePostfixExpr checkExpr;
+    TARGETING::PredicateHwas l_present;
+    // @todo-RTC:124553 - Additional logic for deconfigured Frus
+    //                    may be needed
+    l_present.present(true);
+
+    //When updating data on a later pass ignore dimms
+    if (i_updateData)
+    {
+        checkExpr.push(&predChip).push(&l_present).And();
+    }
+    else
+    {
         checkExpr.push(&predChip).push(&predDimm).Or().push(&l_present).And();
+    }
 
-        TARGETING::TargetHandleList pCheckPres;
-        TARGETING::targetService().getAssociated( pCheckPres, pSys,
-            TARGETING::TargetService::CHILD, TARGETING::TargetService::ALL,
+    TARGETING::TargetHandleList pCheckPres;
+    TARGETING::targetService().getAssociated( pCheckPres, i_pSys,
+    TARGETING::TargetService::CHILD, TARGETING::TargetService::ALL,
             &checkExpr );
 
-        for (TARGETING::TargetHandleList::const_iterator pTarget_it =
+    for (TARGETING::TargetHandleList::const_iterator pTarget_it =
                 pCheckPres.begin();
                 pTarget_it != pCheckPres.end();
                 ++pTarget_it
-            )
-        {
+        )
+    {
 
-            TARGETING::TargetHandle_t pTarget = *pTarget_it;
+        TARGETING::TargetHandle_t pTarget = *pTarget_it;
+        uint32_t l_fruId = pTarget->getAttr<TARGETING::ATTR_FRU_ID>();
 
-            //Check if EEPROM_VPD_FRU_INFO attribute exists
-            TARGETING::EepromVpdFruInfo eepromVpdFruInfo;
-            bool getFruInfo =
-                 pTarget->tryGetAttr<TARGETING::ATTR_EEPROM_VPD_FRU_INFO>
-                                                             (eepromVpdFruInfo);
-            if (getFruInfo)
+        if (l_fruId)
+        {
+            //when updating data, ignore clearing data
+            if (i_updateData == false)
             {
-                TRACFCOMP(g_trac_ipmi, "IPMIFRUINV::setData - Sending IPMI FRU Inventory Data for target with HUID: [%08x]",
-                         pTarget->getAttr<TARGETING::ATTR_HUID>());
-
-                IpmiFruInv *l_fru = IpmiFruInv::Factory(pTarget);
-
-                if (l_fru != NULL)
-                {
-                    //Target recognized, build & send IPMI FRU Invenotry record
-                    l_errl = l_fru->buildFruInvRecord();
-                    if (l_errl)
-                    {
-                        TRACFCOMP(g_trac_ipmi, "IPMIFRUINV::setData - Errors encountered, will skip setting the rest of the data");
-                        break;
-                    }
-                    l_fru->sendFruData(eepromVpdFruInfo.fruId);
-                    delete l_fru;
-                }
+                //Indicate this fruId has data and later clear is not needed
+                io_frusToClear[l_fruId] = false;
             }
+            io_potentialFrus.push_back(std::make_pair(pTarget, l_fruId));
         }
-    } while(0);
+    }
 
-    return l_errl;
+    //Sort the vector by FRU_ID for later use.
+    std::sort(io_potentialFrus.begin(),
+              io_potentialFrus.end(),
+              comparePairs);
 }
diff --git a/src/usr/ipmi/ipmifruinvprvt.H b/src/usr/ipmi/ipmifruinvprvt.H
index 4f0ff4d46..aed5dfc1d 100644
--- a/src/usr/ipmi/ipmifruinvprvt.H
+++ b/src/usr/ipmi/ipmifruinvprvt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/include/usr/ipmi/ipmifru.H $                              */
+/* $Source: src/usr/ipmi/ipmifruinvprvt.H $                               */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -73,8 +73,11 @@ class IpmiFruInv
      * @brief Factory Pattern Creator function
      * @param[in] TargetHandle_t, Handle to target for which
      *             to get relevant IPMI FRU Data from
+     * @param[in] isUpdate, Indicator if the code is updating
+     *             existing data, or setting base data.
      */
-    static IpmiFruInv *Factory(TARGETING::TargetHandle_t i_target);
+    static IpmiFruInv *Factory(TARGETING::TargetHandleList i_targets,
+                               bool i_isUpdate);
 
     /**
      * @brief Package and send the IPMI FRU Data
@@ -171,6 +174,16 @@ class IpmiFruInv
      */
     void printRecordDebugData(const std::vector<uint8_t> &i_data);
 
+    /**
+      * @brief Adds ECID attribute data
+      * @param[in] target, The target to get the Sensor Number from
+      * @param[in] ecid_info, The ECID attribute data
+      * @param[in/out] data, The container to put ECID attribute data in
+      */
+    void addEcidData(const TARGETING::TargetHandle_t& i_target,
+                     const TARGETING::ATTR_ECID_type& i_ecidInfo,
+                     std::vector<uint8_t> &io_data);
+
   private:
 
     /**
@@ -251,7 +264,7 @@ class isdimmIpmiFruInv : public IpmiFruInv
      * @param[in] TargetHandle_t, Handle to target for which
      *             to get relevant IPMI FRU Data from
      */
-    isdimmIpmiFruInv( TARGETING::TargetHandle_t i_target );
+    isdimmIpmiFruInv( TARGETING::TargetHandle_t i_target);
 
     /**
      * @brief Builds the Internal Use Area Data Section
@@ -307,8 +320,11 @@ class procIpmiFruInv : public IpmiFruInv
      *
      * @param[in] TargetHandle_t, Handle to target for which
      *             to get relevant IPMI FRU Data from
+     * @param[in] isUpdate, Indicator if the code is updating
+     *             existing data, or setting base data.
      */
-    procIpmiFruInv( TARGETING::TargetHandle_t i_target );
+    procIpmiFruInv( TARGETING::TargetHandle_t i_target,
+                    bool i_isUpdate );
 
     /**
      * @brief Builds the Internal Use Area Data Section
@@ -340,6 +356,13 @@ class procIpmiFruInv : public IpmiFruInv
      */
     errlHndl_t buildMultiRecordInfoArea(std::vector<uint8_t> &io_data);
 
+  protected:
+
+    //Indicator if a data update is happening.
+    //True - means we are solely updating certain data
+    //False - means we are doing the initial 'base' data set
+    bool iv_isUpdate;
+
   private:
 
     /**
@@ -368,8 +391,14 @@ class backplaneIpmiFruInv : public IpmiFruInv
      *
      * @param[in] TargetHandle_t, Handle to target for which
      *             to get relevant IPMI FRU Data from
+     * @param[in] TargetHandleList, Handle to list of extra
+     *             targets associated with this FRU Record
+     * @param[in] isUpdate, Indicator if the code is updating
+     *             existing data, or setting base data.
      */
-    backplaneIpmiFruInv( TARGETING::TargetHandle_t i_target );
+    backplaneIpmiFruInv( TARGETING::TargetHandle_t i_target,
+                         TARGETING::TargetHandleList i_extraTargets,
+                         bool i_isUpdate );
 
     /**
      * @brief Builds the Internal Use Area Data Section
@@ -401,6 +430,16 @@ class backplaneIpmiFruInv : public IpmiFruInv
      */
     errlHndl_t buildMultiRecordInfoArea(std::vector<uint8_t>& io_data);
 
+  protected:
+    //Indicator if a data update is happening.
+    //True - means we are solely updating certain data
+    //False - means we are doing the initial 'base' data set
+    bool iv_isUpdate;
+
+    //The list of Extra Targets if multiple targets are
+    //associated with one FRU_ID
+    TARGETING::TargetHandleList iv_extraTargets;
+
   private:
 
     /**
@@ -414,7 +453,8 @@ class backplaneIpmiFruInv : public IpmiFruInv
     errlHndl_t addVpdData(std::vector<uint8_t> &io_data,
                           uint8_t i_record,
                           uint8_t i_keyword,
-                          bool i_ascii=false);
+                          bool i_ascii=false,
+                          bool i_typeLengthByte=true);
 
 };
 
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 051a8481f..b1041fb27 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -93,7 +93,6 @@ my $usage = 0;
 my $DEBUG = 0;
 my $outFile = "";
 my $build = "fsp";
-my $ipmiFruid = 0;
 
 use Getopt::Long;
 GetOptions( "mrwdir:s"  => \$mrwdir,
@@ -4410,23 +4409,6 @@ sub generate_is_dimm
     </attribute>";
 
             print "
-    <attribute>
-        <id>EEPROM_VPD_FRU_INFO</id>
-         <default>
-             <field><id>i2cMasterPath</id><value>physical:sys-$sys/"
-                . "node-$node/membuf-$ctaur</value></field>
-             <field><id>port</id><value>$dimmI2C[$j]{port}</value></field>
-             <field><id>devAddr</id><value>0x$dimmI2C[$j]{devAddr}"
-                . "</value></field>
-             <field><id>engine</id><value>$dimmI2C[$j]{engine}</value></field>
-             <field><id>byteAddrOffset</id><value>0x01</value></field>
-             <field><id>maxMemorySizeKB</id><value>0x01</value></field>
-             <field><id>writePageSize</id><value>0x50</value></field>
-             <field><id>writeCycleTime</id><value>0x05</value></field>
-             <field><id>fruId</id><value>$ipmiFruid++</value></field>
-         </default>
-    </attribute>";
-
                last;
             }
         }
@@ -5095,40 +5077,6 @@ sub addEepromsProc
         print "        </default>\n";
         print "    </attribute>\n";
 
-        if ($id_name eq "EEPROM_VPD_PRIMARY_INFO")
-        {
-            print "    <attribute>\n";
-            print "        <id>EEPROM_VPD_FRU_INFO</id>\n";
-
-            print "        <default>\n";
-            print "            <field><id>i2cMasterPath</id><value>physical:",
-                              "sys-$sys/node-$node/",
-                              "proc-$proc</value></field>\n";
-            print "            <field><id>port</id><value>",
-                              "$I2Cdevices[$i]{i2c_port}</value></field>\n";
-            print "            <field><id>devAddr</id><value>0x",
-                              "$I2Cdevices[$i]{i2c_devAddr}",
-                              "</value></field>\n";
-            print "            <field><id>engine</id><value>",
-                              "$I2Cdevices[$i]{i2c_engine}",
-                              "</value></field>\n";
-            print "            <field><id>byteAddrOffset</id><value>",
-                              "$I2Cdevices[$i]{i2c_byte_addr_offset}",
-                              "</value></field>\n";
-            print "            <field><id>maxMemorySizeKB</id><value>",
-                              "$I2Cdevices[$i]{i2c_max_mem_size}",
-                              "</value></field>\n";
-            print "            <field><id>writePageSize</id><value>",
-                              "$I2Cdevices[$i]{i2c_write_page_size}",
-                              "</value></field>\n";
-            print "            <field><id>writeCycleTime</id><value>",
-                              "$I2Cdevices[$i]{i2c_write_cycle_time}",
-                              "</value></field>\n";
-            print "            <field><id>fruId</id><value>$ipmiFruid++",
-                              "</value></field>\n";
-            print "        </default>\n";
-            print "    </attribute>\n";
-        }
     }
 }
 
@@ -5205,42 +5153,6 @@ sub addEepromsCentaur
         print "        </default>\n";
         print "    </attribute>\n";
 
-        if ($id_name eq "EEPROM_VPD_PRIMARY_INFO")
-        {
-            print "    <attribute>\n";
-            print "        <id>EEPROM_VPD_FRU_INFO</id>\n";
-
-            print "        <default>\n";
-            print "            <field><id>i2cMasterPath</id><value>physical:",
-                              "sys-$sys/node-$node/",
-                              "$I2Cdevices[$i]{i2cm_name}",
-                              "-$I2Cdevices[$i]{i2cm_pos}</value></field>\n";
-            print "            <field><id>port</id><value>",
-                              "$I2Cdevices[$i]{i2c_port}</value></field>\n";
-            print "            <field><id>devAddr</id><value>0x",
-                              "$I2Cdevices[$i]{i2c_devAddr}",
-                              "</value></field>\n";
-            print "            <field><id>engine</id><value>",
-                              "$I2Cdevices[$i]{i2c_engine}",
-                              "</value></field>\n";
-            print "            <field><id>byteAddrOffset</id><value>",
-                              "$I2Cdevices[$i]{i2c_byte_addr_offset}",
-                              "</value></field>\n";
-            print "            <field><id>maxMemorySizeKB</id><value>",
-                              "$I2Cdevices[$i]{i2c_max_mem_size}",
-                              "</value></field>\n";
-            print "            <field><id>writePageSize</id><value>",
-                              "$I2Cdevices[$i]{i2c_write_page_size}",
-                              "</value></field>\n";
-            print "            <field><id>writeCycleTime</id><value>",
-                              "$I2Cdevices[$i]{i2c_write_cycle_time}",
-                              "</value></field>\n";
-            print "            <field><id>fruId</id><value>$ipmiFruid++",
-                              "</value></field>\n";
-            print "        </default>\n";
-            print "    </attribute>\n";
-        }
-
     }
 }
 
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index 071506ebd..691cbcb80 100644
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -485,8 +485,6 @@ sub processProcessor
         "EEPROM_SBE_PRIMARY_INFO","i2cMasterPath",$path);
     $targetObj->setAttributeField($target,
         "EEPROM_SBE_BACKUP_INFO","i2cMasterPath",$path);
-    $targetObj->setAttributeField($target,
-        "EEPROM_VPD_FRU_INFO","i2cMasterPath",$path);
 
     ## initialize master processor FSI's
     $targetObj->setAttributeField($target, "FSI_OPTION_FLAGS", "flipPort", "0");
@@ -972,8 +970,6 @@ sub processMembufVpdAssociation
                 my $membuf_target = $membuf_assoc->{DEST_PARENT};
                 setEepromAttributes($targetObj,
                        "EEPROM_VPD_PRIMARY_INFO",$membuf_target,$vpd);
-                #setEepromAttributes($targetObj,
-                #       "EEPROM_VPD_FRU_INFO",$membuf_target,$vpd,"0++");
                 my $index = $targetObj->getBusAttribute($membuf_assoc->{SOURCE},
                                 $membuf_assoc->{BUS_NUM}, "ISDIMM_MBVPD_INDEX");
                 $targetObj->setAttribute(
@@ -1057,10 +1053,6 @@ sub processMembuf
             setEepromAttributes($targetObj,
                        "EEPROM_VPD_PRIMARY_INFO",$dimm_target,
                        $dimm);
-            setEepromAttributes($targetObj,
-                       "EEPROM_VPD_FRU_INFO",$dimm_target,
-                       $dimm,"0++");
-
             my $field=getI2cMapField($targetObj,$dimm_target,$dimm);
             my $map = $dimm_portmap{$dimm_target};
             if ($map eq "") {
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 295786aef..ad0ce83a5 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -1169,84 +1169,6 @@
 </attribute>
 
 <attribute>
-    <id>EEPROM_VPD_FRU_INFO</id>
-    <description>Information needed to address the EEPROM slaves for
-                 IPMI Fru Inventory Purposes</description>
-    <complexType>
-        <description>Structure to define the addressing for an I2C
-                     slave device.</description>
-        <field>
-            <name>i2cMasterPath</name>
-            <description>Entity path to the chip that contains the I2C
-                         master</description>
-            <type>EntityPath</type>
-            <default>physical:sys-0</default>
-        </field>
-        <field>
-            <name>port</name>
-            <description>Port from the I2C Master device. This is a 6-bit
-                         value.</description>
-            <type>uint8_t</type>
-            <default>0x80</default>
-        </field>
-        <field>
-            <name>devAddr</name>
-            <description>Device address on the I2C bus. This is a 7-bit value,
-                         but then shifted 1 bit left.</description>
-            <type>uint8_t</type>
-            <default>0x80</default>
-        </field>
-        <field>
-            <name>engine</name>
-            <description>I2C master engine. This is a 2-bit
-                         value.</description>
-            <type>uint8_t</type>
-            <default>0x80</default>
-        </field>
-        <field>
-            <name>byteAddrOffset</name>
-            <description>The number of bytes a device requires to set its
-                         internal address/offset.</description>
-            <type>uint8_t</type>
-            <default>0x02</default>
-        </field>
-        <field>
-            <name>maxMemorySizeKB</name>
-            <description>The number of kilobytes a device can hold.  'Zero'
-                         value possible for some devices.</description>
-            <type>uint64_t</type>
-            <default>0x0</default>
-        </field>
-        <field>
-            <name>writePageSize</name>
-            <description>The maximum number of bytes that can be written to
-                         a device at one time. 'Zero' value means no maximum
-                         value is expected or checked.</description>
-            <type>uint64_t</type>
-            <default>0x0</default>
-        </field>
-        <field>
-            <name>writeCycleTime</name>
-            <description>The amount of time in milliseconds a device requires
-                         on the completion of a write command to update its
-                         internal memory.</description>
-            <type>uint64_t</type>
-            <default>0x0</default>
-        </field>
-        <field>
-            <name>fruId</name>
-            <description>The IPMI Fru Inventory ID number. This must be a
-                         unique number for every individual FRU within a
-                         system.</description>
-            <type>uint8_t</type>
-            <default>0x0</default>
-        </field>
-    </complexType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-</attribute>
-
-<attribute>
     <id>EEPROM_VPD_BACKUP_INFO</id>
     <description>Information needed to address the EERPROM slaves</description>
     <complexType>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 836648a1f..4dcc796ef 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -304,6 +304,7 @@
     <attribute><id>MNFG_TH_CEN_MBA_RT_RCE_PER_RANK</id></attribute>
     <attribute><id>MNFG_TH_CEN_L4_CACHE_CES</id></attribute>
     <attribute><id>OPT_MEMMAP_GROUP_POLICY</id></attribute>
+    <attribute><id>FRU_ID</id></attribute>
 </targetType>
 
 <targetType>
@@ -533,7 +534,6 @@
     <attribute><id>DUMMY_HEAP_ZERO_DEFAULT</id></attribute>
     <attribute><id>MSS_MEM_MC_IN_GROUP</id></attribute>
     <attribute><id>EEPROM_VPD_PRIMARY_INFO</id></attribute>
-    <attribute><id>EEPROM_VPD_FRU_INFO</id></attribute>
     <attribute><id>EEPROM_VPD_BACKUP_INFO</id></attribute>
     <attribute><id>EEPROM_SBE_PRIMARY_INFO</id></attribute>
     <attribute><id>EEPROM_SBE_BACKUP_INFO</id></attribute>
@@ -903,7 +903,7 @@
         <default>0x00000009</default> <!-- HOSTSVC_HBEL and GARD -->
     </attribute>
     <attribute><id>CDM_DOMAIN</id><default>NODE</default></attribute>
-    <attribute><id>EEPROM_VPD_FRU_INFO</id></attribute>
+    <attribute><id>FRU_ID</id></attribute>
 </targetType>
 
 <targetType>
@@ -1409,7 +1409,6 @@
         </default>
     </attribute>
     <attribute><id>EEPROM_VPD_PRIMARY_INFO</id></attribute>
-    <attribute><id>EEPROM_VPD_FRU_INFO</id></attribute>
     <attribute>
         <id>I2C_BUS_SPEED_ARRAY</id>
         <default>400,0,0,0,0,0</default>
@@ -1472,6 +1471,7 @@
         </default>
     </attribute>
     <attribute><id>CDM_DOMAIN</id><default>MEM</default></attribute>
+    <attribute><id>FRU_ID</id></attribute>
 </targetType>
 
 <!-- Centaur L4 -->
@@ -1542,12 +1542,12 @@
     </attribute>
 
     <attribute><id>EEPROM_VPD_PRIMARY_INFO</id></attribute>
-    <attribute><id>EEPROM_VPD_FRU_INFO</id></attribute>
 
     <attribute><id>VPD_REC_NUM</id></attribute>
     <attribute><id>MSS_EFF_VPD_VERSION</id></attribute>
     <attribute><id>CDM_DOMAIN</id><default>DIMM</default></attribute>
 
+    <attribute><id>FRU_ID</id></attribute>
 </targetType>
 
 <targetType>
diff --git a/src/usr/vpd/cvpd.H b/src/usr/vpd/cvpd.H
index 3a755162b..e7a2d9f06 100644
--- a/src/usr/vpd/cvpd.H
+++ b/src/usr/vpd/cvpd.H
@@ -79,6 +79,7 @@ namespace CVPD
         { OPFR, "OPFR" },
         { VNDR, "VNDR" },
         { SPDX, "SPDX" },
+        { OSYS, "OSYS" },
         // -------------------------------------------------------------------
         // DO NOT USE!!  This is for test purposes ONLY!
         { CVPD_TEST_RECORD, "TEST" },
@@ -157,6 +158,9 @@ namespace CVPD
         { K6,  "K6" },
         { K7,  "K7" },
         { K8,  "K8" },
+        { MM,  "MM" },
+        { SS,  "SS" },
+        { ET,  "ET" },
 
         // -------------------------------------------------------------------
         // DO NOT USE!!  This is for test purposes ONLY!