Allow SPDX override as part of FW load

Memory VPD contents have changed since the cards have been
built so we need to provide a method to override the data
as part of a FW build.  We have done the same thing
previously for the MEMD record on the Nimbus machines
so will use the same design here for SPDX.

As part of this change, the previous MEMD support was
refactored to be completely generic so a single code path
can be used for any arbitrary record.

Change-Id: I5af5e965429c881be3de0d18c82b1d7918ac9c22
CQ: SW430659
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61190
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60980

1 files changed, 1 insertions, 25 deletions

diff --git a/src/include/usr/devicefw/userif.H b/src/include/usr/devicefw/userif.H
index 4df37c8a8..68f923f95 100644
--- a/src/include/usr/devicefw/userif.H
+++ b/src/include/usr/devicefw/userif.H
@@ -67,7 +67,7 @@ namespace DeviceFW
         SIO,
         AHB_SIO,
         DVPD,      // Direct access memory VPD
-        MEMD_VPD,
+        DEPRECATED_MEMD_VPD,
         NODECOMM,
 
         LAST_ACCESS_TYPE,
@@ -256,30 +256,6 @@ namespace DeviceFW
             static_cast<uint64_t>(( i_location ))
 
     /**
-     * Construct the device addressing parameters for the DVPD (Direct access
-     * memory VPD) device ops.
-     * @param[in] i_record - The enumeration of the DVPD record to access.
-     * @param[in] i_keyword - The enumeration of the DVPD keyword, located
-     *      within the i_record Record to access.
-     */
-    #define DEVICE_MEMD_VPD_ADDRESS( i_record, i_keyword )\
-        DEVICE_MEMD_VPD_FORCE_ADDRESS( i_record, i_keyword, VPD::PNOR )
-
-    /**
-     * Construct the device addressing parameters for the DVPD device ops.
-     * @param[in] i_record - The enumeration of the DVPD record to access.
-     * @param[in] i_keyword - The enumeration of the DVPD keyword, located
-     *      within the i_record Record to access.
-     * @param[in] i_location - The location of the data (PNOR/SEEPROM)
-            see vpd_if.H
-     */
-    #define DEVICE_MEMD_VPD_FORCE_ADDRESS( i_record, i_keyword, i_location )\
-        DeviceFW::MEMD_VPD, static_cast<uint64_t>(( i_record )),\
-            static_cast<uint64_t>(( i_keyword )),\
-            static_cast<uint64_t>(( i_location ))
-
-
-    /**
      * Construct the device addressing parameters for the SCAN device ops.
      * @param[in] i_ring - The ring address to scan
      * @param[in] i_ringlen - The length of the ring to scan in bits