Removing some more old fapi1 and hwp code

Deleted all of the old fapi1 code
Moved potentially reuseable occ code to a new dir
Deleted a variety of p8 hwp files

Change-Id: I8b6ab72fef3f1413d919bdd21bc88f2c4f59c5c3
RTC: 146345
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23075
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

10 files changed, 0 insertions, 2188 deletions

diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C b/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C
deleted file mode 100755
index 787d4f5a6..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C
+++ /dev/null
@@ -1,184 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C $ */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-// $Id: getL3DeltaDataAttr.C,v 1.5 2014/03/20 16:24:48 whs Exp $
-/**
- *  @file getL3DeltaDataAttr.C
- *
- *  @brief fetch processor ex func l3 delta data attributes based on chip type, 
- *  EC and PROC_PBIEX_ASYNC_SEL value from static arrays in 
- *  fapiL3DeltaDataAttr.H
- *
- */
-
-#include    <stdint.h>
-
-//  fapi support
-#include    <fapi.H>
-#include    <getL3DeltaDataAttr.H>
-#include    <fapiL3DeltaDataAttr.H>
-
-// Logic overview
-
-// Define and initialize variables
-// Get chip type
-// Get EC level
-// Get PROC_PBIEX_ASYNC_SEL attr
-// Use chip & ec to select array entry and selection attr to select data array 
-//   entry
-// Set return delta data attr value
-
-extern "C"
-{
-
-fapi::ReturnCode getL3DeltaDataAttr( const fapi::Target  &i_fapiTarget,
-                                     uint32_t (&o_data)[DELTA_DATA_SIZE],
-                                     uint32_t (&o_ringLength))
-{
-     FAPI_INF("getL3DeltaDataAttr: entry" );
-
-     // Initialize return values to 0x00
-     memset(o_data, 0x00, sizeof(o_data));
-     o_ringLength = 0;
-
-     // Define and initialize variables
-
-     uint8_t                    i = 0;
-     uint8_t                    l_attrDdLevel = 0;
-     fapi::TargetType           l_targetType = fapi::TARGET_TYPE_NONE;
-     fapi::ATTR_NAME_Type       l_chipType = 0x00;
-     fapi::ATTR_PROC_PBIEX_ASYNC_SEL_Type l_selection = 0;
-     fapi::ReturnCode           rc;
-
-     // Get attributes used to determine delta data
-
-     do
-     {
-         // Verify input target is a processor
-         l_targetType = i_fapiTarget.getType();
-         if (l_targetType != fapi::TARGET_TYPE_PROC_CHIP)
-         {
-             FAPI_ERR("getL3DeltaDataAttr:  Invalid target type passed on "
-                      "invocation. target type=0x%08X ", 
-                       static_cast<uint32_t>(l_targetType));
-             // Return error on get attr
-             fapi::TargetType & TARGET_TYPE = l_targetType;
-             FAPI_SET_HWP_ERROR(rc, RC_GET_L3_DELTA_DATA_PARAMETER_ERR );
-             break;
-         }
-
-         // Get chip type
-         rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_NAME,
-                                       &i_fapiTarget,
-                                       l_chipType);
-         if (rc)
-         {
-             FAPI_ERR("getL3DeltaDataAttr: FAPI_ATTR_GET_PRIVILEGED of "
-                      "ATTR_NAME failed w/rc=0x%08X", 
-                       static_cast<uint32_t>(rc));
-             break;
-         }
-
-         // Get EC level
-         rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_EC,
-                                       &i_fapiTarget,
-                                       l_attrDdLevel);
-         // Exit on error
-         if (rc)
-         {
-             FAPI_ERR("getL3DeltaDataAttr: FAPI_ATTR_GET_PRIVILEGED of "
-                      "ATTR_EC failed w/rc=0x%08X", static_cast<uint32_t>(rc));
-             break;
-         }
-
-         // Get proc_pbiex_async_sel
-         rc = FAPI_ATTR_GET(ATTR_PROC_PBIEX_ASYNC_SEL,
-                            NULL,
-                            l_selection);
-         // Exit on error
-         if (rc)
-         {
-             FAPI_ERR("getL3DeltaDataAttr: FAPI_ATTR_GET of "
-                      "ATTR_PROC_PBIEX_ASYNC_SEL failed w/rc=0x%08X", 
-                       static_cast<uint32_t>(rc));
-             break;
-         }
-         // Check for valid value
-         if ((l_selection != fapi::ENUM_ATTR_PROC_PBIEX_ASYNC_SEL_SEL0) &&
-             (l_selection != fapi::ENUM_ATTR_PROC_PBIEX_ASYNC_SEL_SEL1) &&
-             (l_selection != fapi::ENUM_ATTR_PROC_PBIEX_ASYNC_SEL_SEL2)) 
-         {
-             FAPI_ERR("getL3DeltaDataAttr:  FAPI_ATTR_GET() returned "
-                      "unsupported value ATTR_PROC_PBIEX_ASYNC_SEL=0x%02x", 
-                       l_selection);
-             fapi::ATTR_PROC_PBIEX_ASYNC_SEL_Type & SELECT_VAL = l_selection;
-             FAPI_SET_HWP_ERROR(rc, RC_GET_L3_DELTA_DATA_SELECT_ERR );
-             break;
-         }
-
-         FAPI_INF("getL3DeltaDataAttr:  Chip type=0x%02x EC=0x%02x "
-                  "ATTR_PROC_PBIEX_ASYNC_SEL = %i",
-                  l_chipType, l_attrDdLevel, l_selection);
-
-         // Murano DD1.2 and DD1.0 are equivalent in terms of engineering data
-         if ((l_chipType == fapi::ENUM_ATTR_NAME_MURANO) &&
-             (l_attrDdLevel == 0x12))
-         {
-             FAPI_INF("getL3DeltaDataAttr: Treating EC1.2 like EC1.0");
-             l_attrDdLevel = 0x10;
-         }
-
-         // Use chip & ec to select array entry and selection attr to select 
-         // data array entry
-         for (i = 0; ((i < (sizeof(L3_DELTA_DATA_array) / 
-                            sizeof(L3_DELTA_DATA_ATTR))) &&
-             ((L3_DELTA_DATA_array[i].l_ATTR_CHIPTYPE != l_chipType) ||
-              (L3_DELTA_DATA_array[i].l_ATTR_EC       != l_attrDdLevel) ||
-              (L3_DELTA_DATA_array[i].l_ATTR_SELECT   != l_selection))); i++)
-         { }
-         // No match found
-         if (i == (sizeof(L3_DELTA_DATA_array)/sizeof(L3_DELTA_DATA_ATTR)))
-         {
-             FAPI_ERR("getL3DeltaDataAttr:  No match found for chiptype=0x%x "
-                      "EC=0x%x selection=%d", 
-                      l_chipType, l_attrDdLevel, l_selection);
-             // Return error on get attr
-             fapi::ATTR_NAME_Type & CHIP_NAME = l_chipType;
-             uint8_t & CHIP_EC = l_attrDdLevel;
-             FAPI_SET_HWP_ERROR(rc, RC_GET_L3_DELTA_DATA_ERR );
-             break;
-         }
-
-         // Set return delta data attr value
-         memcpy(o_data,L3_DELTA_DATA_array[i].l_ATTR_L3_DELTA_DATA,
-                sizeof(o_data));
-         o_ringLength = L3_DELTA_DATA_array[i].l_ATTR_BIT_LENGTH;
-
-     } while (0);
-
-     FAPI_INF("getL3DeltaDataAttr: exit rc=0x%x", static_cast<uint32_t>(rc) );
-
-     return  rc;
-}
-
-}   // extern "C"
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/n1_10_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/n1_10_winkle_ring.attributes
deleted file mode 100644
index 6d92a0afe..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/n1_10_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: n1_10_winkle_ring.attributes,v 1.1 2014/11/06 22:44:21 szhong Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49198
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14C60080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15770078
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x15F2001E
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168A0009
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168B0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168C0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16EE0010
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16EF0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60009
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F70002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x16F80040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17DE0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EA0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F50040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18010040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18040024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49198
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14C60080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15770078
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x15F2001E
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168A0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168B0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168C0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16EE0090
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16EF00A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F70001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x16F80040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17DE0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EA0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F50040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18010040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18040024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49198
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14C60080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x168A000D
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x168B0003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168C0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16F6000D
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16F70003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16F80040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17DE0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17EA0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17ED0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17F50040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x18010040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x18040024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes
deleted file mode 100644
index b604d10b3..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: p8_10_winkle_ring.attributes,v 1.3 2014/03/20 02:43:32 jmcgill Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49022
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14AE0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14B00050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14BF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14C30040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14C50050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x15610078
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15DC001E
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x16740009
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16750002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16760040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16D80010
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16D90020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16E00009
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16E10002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16E20040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17C80040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17D40040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17D70024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17DF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17EB0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17EE0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49022
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14AE0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14B00050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14BF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14C30040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14C50050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x15610078
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15DC001E
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x16740005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16750001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16760040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16D80090
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16D900A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16E00005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16E10001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16E20040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17C80040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17D40040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17D70024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17DF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17EB0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17EE0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49022
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14AE0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14B00050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14BF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14C30040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14C50050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x1674000D
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x16750003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x16760040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16E0000D
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16E10003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16E20040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17C80040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17D40040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17D70024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17DF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17EB0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17EE0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes
deleted file mode 100644
index 46913a36b..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: p8_20_winkle_ring.attributes,v 1.3 2014/03/20 02:46:32 jmcgill Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49195
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14C60080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15760003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x157700C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x15F200F0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168A0048
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168B0012
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16EE0081
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16F60048
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F70012
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17DD0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17E90002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17EC0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17ED0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17F40002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x18000002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18030001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18040020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49195
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14C60080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15760003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x157700C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x15F200F0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168A0028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168B000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16ED0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16EE0085
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F7000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17DD0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17E90002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EC0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F40002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18000002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18030001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x18040020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49195
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14C60080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x168A0068
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x168B001A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16F60068
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16F7001A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17DD0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17E90002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17EC0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17ED0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17F40002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x18000002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x18030001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x18040020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/proc_l3_delta_data_errors.xml b/src/usr/hwpf/hwp/winkle_ring_accessors/proc_l3_delta_data_errors.xml
deleted file mode 100755
index d7c173103..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/proc_l3_delta_data_errors.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/winkle_ring_accessors/proc_l3_delta_data_errors.xml $ -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
-<!--                                                                        -->
-<!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
-<!-- you may not use this file except in compliance with the License.       -->
-<!-- You may obtain a copy of the License at                                -->
-<!--                                                                        -->
-<!--     http://www.apache.org/licenses/LICENSE-2.0                         -->
-<!--                                                                        -->
-<!-- Unless required by applicable law or agreed to in writing, software    -->
-<!-- distributed under the License is distributed on an "AS IS" BASIS,      -->
-<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        -->
-<!-- implied. See the License for the specific language governing           -->
-<!-- permissions and limitations under the License.                         -->
-<!--                                                                        -->
-<!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_l3_delta_data_errors.xml,v 1.2 2013/12/11 22:49:43 mjjones Exp $ -->
-<!-- Error definitions for getL3DeltaData  procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_GET_L3_DELTA_DATA_ERR</rc>
-    <description>No matching entry was found for requested chip type and EC level.</description>
-    <ffdc>CHIP_NAME</ffdc>
-    <ffdc>CHIP_EC</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <hwpError>
-    <rc>RC_GET_L3_DELTA_DATA_PARAMETER_ERR</rc>
-    <description>Invalid target type passed on invocation.</description>
-    <ffdc>TARGET_TYPE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <hwpError>
-    <rc>RC_GET_L3_DELTA_DATA_SELECT_ERR</rc>
-    <description>
-        The ATTR_PROC_PBIEX_ASYNC_SEL attribute, used to select the correct
-        data to return is not valid.
-    </description>
-    <ffdc>SELECT_VAL</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes
deleted file mode 100644
index 4af3ba016..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: s1_10_winkle_ring.attributes,v 1.6 2014/03/20 02:38:43 jmcgill Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14A70040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14AC0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x15480007
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15490080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15C30001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x15C400E0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x165C0090
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x165D0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16BF0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16C00002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16C80090
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16C90024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17AF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17BB0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17BE0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17BF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17C60004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17D20004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x17D50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x17D60040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14A70040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14AC0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x15480007
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15490080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15C30001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x15C400E0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x165C0050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x165D0014
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16BF0009
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16C0000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16C80050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16C90014
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17AF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17BB0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17BE0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17BF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17C60004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17D20004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x17D50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x17D60040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14A70040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14AC0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x165C00D0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x165D0034
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x16C800D0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16C90034
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x17AF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x17BB0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17BE0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17BF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17C60004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17D20004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17D50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17D60040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes
deleted file mode 100644
index b80e6de98..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: s1_13_winkle_ring.attributes,v 1.3 2014/03/20 02:40:36 jmcgill Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14A70040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14AC0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x15480007
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15490080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15C30001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x15C400E0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x165C0090
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x165D0024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16BF0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16C00002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16C80090
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16C90024
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17AF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17BB0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17BE0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17BF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17C60004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17D20004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x17D50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x17D60040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14A70040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14AC0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x15480007
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15490080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15C30001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x15C400E0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x165C0050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x165D0014
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16BF0009
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16C0000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16C80050
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16C90014
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17AF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17BB0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17BE0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17BF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17C60004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17D20004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x17D50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x17D60040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14A70040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14AA0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14AC0005
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x165C00D0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x165D0034
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x16C800D0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16C90034
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x17AF0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x17BB0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17BE0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17BF0040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17C60004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17D20004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17D50002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17D60040
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes
deleted file mode 100644
index 1ca618a7d..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: s1_20_winkle_ring.attributes,v 1.3 2014/03/20 02:41:15 jmcgill Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14D50080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D80008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14DA000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x1576000F
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15F10003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15F200C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16890001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168A0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168B0048
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16ED0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16EE0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16F50001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F70048
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17DD0008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17E90008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EC0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F40008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18000008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18030004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x18040080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14D50080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D80008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14DA000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x1576000F
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15F10003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15F200C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x168A00A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168B0028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16ED0012
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16EE0014
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16F600A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16F70028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17DD0008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17E90008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17EC0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17ED0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17F40008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x18000008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x18030004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18040080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14D50080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D80008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14DA000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x16890001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x168A00A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x168B0068
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16F50001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16F600A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16F70068
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17DD0008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17E90008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17EC0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17ED0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17F40008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x18000008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x18030004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x18040080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes
deleted file mode 100644
index 0b9fad3be..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes
+++ /dev/null
@@ -1,274 +0,0 @@
-# $Id: s1_21_winkle_ring.attributes,v 1.3 2014/03/20 02:41:48 jmcgill Exp $
-#===============================================================================BEGIN Entry
-#
-#SELECT=0
-#PU_EX_DPLL_FREQ = 4800
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14D50080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D80008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14DA000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x1576000F
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15F10003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15F200C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16890001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168A0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168B0048
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16ED0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16EE0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16F50001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F70048
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17DD0008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17E90008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EC0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F40008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18000008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18030004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x18040080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=1
-#PU_EX_DPLL_FREQ = 2400
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14D50080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D80008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14DA000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x1576000F
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x15F10003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15F200C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x168A00A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x168B0028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16ED0012
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x16EE0014
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16F600A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16F70028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17DD0008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17E90008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17EC0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17ED0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17F40008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x18000008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x18030004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18040080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
-#===============================================================================BEGIN Entry
-#
-#SELECT=2
-#PU_EX_DPLL_FREQ = 1200
-#PU_NEST_FREQ = 2400
-#------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
-#    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
-#------------------------------------------------------------------------------- Attribute View
-
-ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[3] u32[64]  0x14D50080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D80008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14DA000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x16890001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x168A00A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x168B0068
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x16F50001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16F600A0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16F70068
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17DD0008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17E90008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17EC0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17ED0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17F40008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x18000008
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x18030004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x18040080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0xFFFF0000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[29] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[30] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[31] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[32] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[33] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[34] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[35] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[36] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[37] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[38] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[39] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[40] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[41] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[42] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[43] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[44] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[45] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[46] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[47] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[48] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[49] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[50] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[51] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[52] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[53] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[54] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[55] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[56] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[57] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[58] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[59] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[60] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[61] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[62] u32[64]  0x00000000
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
-#===============================================================================END   Entry
-
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/winkle_ring.mk b/src/usr/hwpf/hwp/winkle_ring_accessors/winkle_ring.mk
deleted file mode 100644
index ac15de95b..000000000
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/winkle_ring.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/usr/hwpf/hwp/winkle_ring_accessors/winkle_ring.mk $
-#
-# OpenPOWER HostBoot Project
-#
-# COPYRIGHT International Business Machines Corp. 2013,2014
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/winkle_ring_accessors
-
-VPATH += ${HWPPATH}/winkle_ring_accessors
-
-OBJS += getL3DeltaDataAttr.o
-