clean up some files

This patch removes from files from the repository that are
generated and which were accidentely committed to the repo.

Change-Id: Ic5678bd33588dd4f9b0490f986edf3484d7c7464
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24304
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Claus Michael Olsen <cmolsen@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>

8 files changed, 0 insertions, 3391 deletions

diff --git a/hwpf/include/fapi2AttrEnumInfo.csv b/hwpf/include/fapi2AttrEnumInfo.csv
deleted file mode 100644
index 2d740720..00000000
--- a/hwpf/include/fapi2AttrEnumInfo.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-# fapiAttrEnumInfo.csv
-# This file is generated by perl script fapiParseAttributeInfo.pl
-# It lists information about FAPI attribute enumeratorss and is
-# used to process FAPI Attribute text files (overrides/syncs)
-# Format:
-# <ENUM-STR>,<ENUM-VAL>
-ATTR_SCRATCH_UINT64_2_VAL_A,0
-ATTR_SCRATCH_UINT64_2_VAL_B,5
-ATTR_SCRATCH_UINT64_2_VAL_C,0xffffffffffffffff
-ATTR_SCRATCH_INT64_2_VAL_A,0
-ATTR_SCRATCH_INT64_2_VAL_B,5
-ATTR_SCRATCH_INT64_2_VAL_C,0xffffffffffffffff
-ATTR_SYSTEM_IPL_PHASE_HB_IPL,0x1
-ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME,0x2
-ATTR_SYSTEM_IPL_PHASE_CACHE_CONTAINED,0x4
diff --git a/hwpf/include/fapi2AttrInfo.csv b/hwpf/include/fapi2AttrInfo.csv
deleted file mode 100644
index 0ebe9e41..00000000
--- a/hwpf/include/fapi2AttrInfo.csv
+++ /dev/null
@@ -1,87 +0,0 @@
-# fapiAttrInfo.csv
-# This file is generated by perl script fapiParseAttributeInfo.pl
-# It lists information about FAPI attributes and is used to
-# process FAPI Attribute text files (overrides/syncs)
-# Format:
-# <FAPI-ATTR-ID-STR>,<LAYER-ATTR-ID-STR>,<ATTR-ID-VAL>,<ATTR-TYPE>
-# Note that for the AttributeTanks at the FAPI layer, the
-# FAPI-ATTR-ID-STR and LAYER-ATTR-ID-STR will be identical
-ATTR_SCRATCH_UINT8_1,ATTR_SCRATCH_UINT8_1,0xd16a035,u8
-ATTR_SCRATCH_UINT8_2,ATTR_SCRATCH_UINT8_2,0xd53bc45,u8
-ATTR_SCRATCH_UINT32_1,ATTR_SCRATCH_UINT32_1,0x6e35711,u32
-ATTR_SCRATCH_UINT32_2,ATTR_SCRATCH_UINT32_2,0xb6b04cf,u32
-ATTR_SCRATCH_UINT64_1,ATTR_SCRATCH_UINT64_1,0x97c0c12,u64
-ATTR_SCRATCH_UINT64_2,ATTR_SCRATCH_UINT64_2,0xa09fac0,u64
-ATTR_SCRATCH_INT8_1,ATTR_SCRATCH_INT8_1,0x8d69f35,8
-ATTR_SCRATCH_INT8_2,ATTR_SCRATCH_INT8_2,0xd0a271b,8
-ATTR_SCRATCH_INT32_1,ATTR_SCRATCH_INT32_1,0xb5d67e7,32
-ATTR_SCRATCH_INT32_2,ATTR_SCRATCH_INT32_2,0xedc4c34,32
-ATTR_SCRATCH_INT64_1,ATTR_SCRATCH_INT64_1,0x439b62e,64
-ATTR_SCRATCH_INT64_2,ATTR_SCRATCH_INT64_2,0x1201173,64
-ATTR_SCRATCH_UINT32_ARRAY,ATTR_SCRATCH_UINT32_ARRAY,0xc4ffba2,u32[64]
-ATTR_SCRATCH_UINT32_PERV_ARRAY,ATTR_SCRATCH_UINT32_PERV_ARRAY,0xb53ac5c,u32[64]
-ATTR_REPR_RING,ATTR_REPR_RING,0xb4a5f78,u32
-ATTR_TIME_RING,ATTR_TIME_RING,0x3b26e38,u32
-ATTR_GPTR_RING,ATTR_GPTR_RING,0xe41805b,u32
-ATTR_PLL_RING,ATTR_PLL_RING,0x2548674,u32
-ATTR_CORE_REPR_RING,ATTR_CORE_REPR_RING,0x938b8fc,u32
-ATTR_CORE_TIME_RING,ATTR_CORE_TIME_RING,0xd3f938f,u32
-ATTR_CORE_GPTR_RING,ATTR_CORE_GPTR_RING,0x94e6329,u32
-ATTR_L2_REPR_RING,ATTR_L2_REPR_RING,0x9db7d8a,u32
-ATTR_L2_TIME_RING,ATTR_L2_TIME_RING,0x5999526,u32
-ATTR_L2_GPTR_RING,ATTR_L2_GPTR_RING,0x780f3d2,u32
-ATTR_L3_REPR_RING,ATTR_L3_REPR_RING,0x1364905,u32
-ATTR_L3_TIME_RING,ATTR_L3_TIME_RING,0x514ea87,u32
-ATTR_L3_GPTR_RING,ATTR_L3_GPTR_RING,0x2179cb4,u32
-ATTR_DPLL_RING,ATTR_DPLL_RING,0xad1e658,u32
-ATTR_PG_FSI,ATTR_PG_FSI,0xa484728,u8
-ATTR_PG_PRV,ATTR_PG_PRV,0xf1e3768,u8
-ATTR_PG_N0,ATTR_PG_N0,0x6e7e43d,u8
-ATTR_PG_N1,ATTR_PG_N1,0x916d851,u8
-ATTR_PG_N2,ATTR_PG_N2,0x311b213,u8
-ATTR_PG_N3,ATTR_PG_N3,0x196b4d6,u8
-ATTR_PG_XB,ATTR_PG_XB,0xbdda26f,u8
-ATTR_PG_MC01,ATTR_PG_MC01,0xc307a5c,u8
-ATTR_PG_MC23,ATTR_PG_MC23,0xe2ae686,u8
-ATTR_PG_OB0,ATTR_PG_OB0,0x4b73198,u8
-ATTR_PG_OB1,ATTR_PG_OB1,0x51edd9c,u8
-ATTR_PG_OB2,ATTR_PG_OB2,0x8588771,u8
-ATTR_PG_OB3,ATTR_PG_OB3,0x5f2d7ec,u8
-ATTR_PG_PCI0,ATTR_PG_PCI0,0x16db49c,u8
-ATTR_PG_PCI1,ATTR_PG_PCI1,0x3056952,u8
-ATTR_PG_PCI2,ATTR_PG_PCI2,0x122b6d7,u8
-ATTR_PG_EQ0,ATTR_PG_EQ0,0x878b5c8,u8
-ATTR_PG_EQ1,ATTR_PG_EQ1,0x03c3069,u8
-ATTR_PG_EQ2,ATTR_PG_EQ2,0xc013357,u8
-ATTR_PG_EQ3,ATTR_PG_EQ3,0xf230319,u8
-ATTR_PG_EQ4,ATTR_PG_EQ4,0xbbac8d0,u8
-ATTR_PG_EQ5,ATTR_PG_EQ5,0x2dc5723,u8
-ATTR_PG_EC00,ATTR_PG_EC00,0x901df3a,u8
-ATTR_PG_EC01,ATTR_PG_EC01,0x47d022a,u8
-ATTR_PG_EC02,ATTR_PG_EC02,0x08de5af,u8
-ATTR_PG_EC03,ATTR_PG_EC03,0xb7fc8f5,u8
-ATTR_PG_EC04,ATTR_PG_EC04,0xb5fcba5,u8
-ATTR_PG_EC05,ATTR_PG_EC05,0x83a3441,u8
-ATTR_PG_EC06,ATTR_PG_EC06,0x1b6bebf,u8
-ATTR_PG_EC07,ATTR_PG_EC07,0x1eb958b,u8
-ATTR_PG_EC08,ATTR_PG_EC08,0x09e32c8,u8
-ATTR_PG_EC09,ATTR_PG_EC09,0x6775c2d,u8
-ATTR_PG_EC10,ATTR_PG_EC10,0xddbba81,u8
-ATTR_PG_EC11,ATTR_PG_EC11,0xfc76788,u8
-ATTR_PG_EC12,ATTR_PG_EC12,0x3f34e1f,u8
-ATTR_PG_EC13,ATTR_PG_EC13,0x9ff5ec8,u8
-ATTR_PG_EC14,ATTR_PG_EC14,0x0aa4ad3,u8
-ATTR_PG_EC15,ATTR_PG_EC15,0x30379c7,u8
-ATTR_PG_EC16,ATTR_PG_EC16,0x0f4b161,u8
-ATTR_PG_EC17,ATTR_PG_EC17,0xcf99c88,u8
-ATTR_PG_EC18,ATTR_PG_EC18,0x9867191,u8
-ATTR_PG_EC19,ATTR_PG_EC19,0xeb29d56,u8
-ATTR_PG_EC20,ATTR_PG_EC20,0xeb32b14,u8
-ATTR_PG_EC21,ATTR_PG_EC21,0x31c5be4,u8
-ATTR_PG_EC22,ATTR_PG_EC22,0x0563eb4,u8
-ATTR_PG_EC23,ATTR_PG_EC23,0x8477c54,u8
-ATTR_CHIP_UNIT_POS,ATTR_CHIP_UNIT_POS,0x07f067a,u8
-ATTR_FABRIC_SYSTEM_ID,ATTR_FABRIC_SYSTEM_ID,0x6856732,u8
-ATTR_SYSTEM_IPL_PHASE,ATTR_SYSTEM_IPL_PHASE,0xf9c1ac6,u8
-ATTR_BACKUP_SEEPROM_SELECT,ATTR_BACKUP_SEEPROM_SELECT,0x4ca9b40,u8
-ATTR_MC_SYNC_MODE,ATTR_MC_SYNC_MODE,0x0472be6,u8
diff --git a/hwpf/include/fapi2AttributeIds.H b/hwpf/include/fapi2AttributeIds.H
deleted file mode 100644
index 4a36c506..00000000
--- a/hwpf/include/fapi2AttributeIds.H
+++ /dev/null
@@ -1,746 +0,0 @@
-// fapi2AttributeIds.H
-// This file is generated by perl script fapiParseAttributeInfo.pl
-
-#ifndef FAPI2ATTRIBUTEIDS_H_
-#define FAPI2ATTRIBUTEIDS_H_
-
-#ifndef __ASSEMBLER__
-
-#include <target.H>
-#include <target_types.H>
-
-namespace fapi2
-{
-
-/**
- * @brief Enumeration of attribute IDs
- */
-enum AttributeId
-{
-    ATTR_SCRATCH_UINT8_1 = 0xd16a035,
-    ATTR_SCRATCH_UINT8_2 = 0xd53bc45,
-    ATTR_SCRATCH_UINT32_1 = 0x6e35711,
-    ATTR_SCRATCH_UINT32_2 = 0xb6b04cf,
-    ATTR_SCRATCH_UINT64_1 = 0x97c0c12,
-    ATTR_SCRATCH_UINT64_2 = 0xa09fac0,
-    ATTR_SCRATCH_INT8_1 = 0x8d69f35,
-    ATTR_SCRATCH_INT8_2 = 0xd0a271b,
-    ATTR_SCRATCH_INT32_1 = 0xb5d67e7,
-    ATTR_SCRATCH_INT32_2 = 0xedc4c34,
-    ATTR_SCRATCH_INT64_1 = 0x439b62e,
-    ATTR_SCRATCH_INT64_2 = 0x1201173,
-    ATTR_SCRATCH_UINT32_ARRAY = 0xc4ffba2,
-    ATTR_SCRATCH_UINT32_PERV_ARRAY = 0xb53ac5c,
-    ATTR_REPR_RING = 0xb4a5f78,
-    ATTR_TIME_RING = 0x3b26e38,
-    ATTR_GPTR_RING = 0xe41805b,
-    ATTR_PLL_RING = 0x2548674,
-    ATTR_CORE_REPR_RING = 0x938b8fc,
-    ATTR_CORE_TIME_RING = 0xd3f938f,
-    ATTR_CORE_GPTR_RING = 0x94e6329,
-    ATTR_L2_REPR_RING = 0x9db7d8a,
-    ATTR_L2_TIME_RING = 0x5999526,
-    ATTR_L2_GPTR_RING = 0x780f3d2,
-    ATTR_L3_REPR_RING = 0x1364905,
-    ATTR_L3_TIME_RING = 0x514ea87,
-    ATTR_L3_GPTR_RING = 0x2179cb4,
-    ATTR_DPLL_RING = 0xad1e658,
-    ATTR_PG_FSI = 0xa484728,
-    ATTR_PG_PRV = 0xf1e3768,
-    ATTR_PG_N0 = 0x6e7e43d,
-    ATTR_PG_N1 = 0x916d851,
-    ATTR_PG_N2 = 0x311b213,
-    ATTR_PG_N3 = 0x196b4d6,
-    ATTR_PG_XB = 0xbdda26f,
-    ATTR_PG_MC01 = 0xc307a5c,
-    ATTR_PG_MC23 = 0xe2ae686,
-    ATTR_PG_OB0 = 0x4b73198,
-    ATTR_PG_OB1 = 0x51edd9c,
-    ATTR_PG_OB2 = 0x8588771,
-    ATTR_PG_OB3 = 0x5f2d7ec,
-    ATTR_PG_PCI0 = 0x16db49c,
-    ATTR_PG_PCI1 = 0x3056952,
-    ATTR_PG_PCI2 = 0x122b6d7,
-    ATTR_PG_EQ0 = 0x878b5c8,
-    ATTR_PG_EQ1 = 0x03c3069,
-    ATTR_PG_EQ2 = 0xc013357,
-    ATTR_PG_EQ3 = 0xf230319,
-    ATTR_PG_EQ4 = 0xbbac8d0,
-    ATTR_PG_EQ5 = 0x2dc5723,
-    ATTR_PG_EC00 = 0x901df3a,
-    ATTR_PG_EC01 = 0x47d022a,
-    ATTR_PG_EC02 = 0x08de5af,
-    ATTR_PG_EC03 = 0xb7fc8f5,
-    ATTR_PG_EC04 = 0xb5fcba5,
-    ATTR_PG_EC05 = 0x83a3441,
-    ATTR_PG_EC06 = 0x1b6bebf,
-    ATTR_PG_EC07 = 0x1eb958b,
-    ATTR_PG_EC08 = 0x09e32c8,
-    ATTR_PG_EC09 = 0x6775c2d,
-    ATTR_PG_EC10 = 0xddbba81,
-    ATTR_PG_EC11 = 0xfc76788,
-    ATTR_PG_EC12 = 0x3f34e1f,
-    ATTR_PG_EC13 = 0x9ff5ec8,
-    ATTR_PG_EC14 = 0x0aa4ad3,
-    ATTR_PG_EC15 = 0x30379c7,
-    ATTR_PG_EC16 = 0x0f4b161,
-    ATTR_PG_EC17 = 0xcf99c88,
-    ATTR_PG_EC18 = 0x9867191,
-    ATTR_PG_EC19 = 0xeb29d56,
-    ATTR_PG_EC20 = 0xeb32b14,
-    ATTR_PG_EC21 = 0x31c5be4,
-    ATTR_PG_EC22 = 0x0563eb4,
-    ATTR_PG_EC23 = 0x8477c54,
-    ATTR_CHIP_UNIT_POS = 0x07f067a,
-    ATTR_FABRIC_SYSTEM_ID = 0x6856732,
-    ATTR_SYSTEM_IPL_PHASE = 0xf9c1ac6,
-    ATTR_BACKUP_SEEPROM_SELECT = 0x4ca9b40,
-    ATTR_MC_SYNC_MODE = 0x0472be6,
-};
-
-/**
- * @brief Attribute Information
- */
-/* ATTR_SCRATCH_UINT8_1 */
-typedef uint8_t ATTR_SCRATCH_UINT8_1_Type;
-const bool ATTR_SCRATCH_UINT8_1_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT8_1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT8_1_PlatInit = true;
-const bool ATTR_SCRATCH_UINT8_1_InitToZero = false;
-
-/* ATTR_SCRATCH_UINT8_2 */
-typedef uint8_t ATTR_SCRATCH_UINT8_2_Type;
-const bool ATTR_SCRATCH_UINT8_2_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT8_2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT8_2_PlatInit = true;
-const bool ATTR_SCRATCH_UINT8_2_InitToZero = false;
-
-/* ATTR_SCRATCH_UINT32_1 */
-typedef uint32_t ATTR_SCRATCH_UINT32_1_Type;
-const bool ATTR_SCRATCH_UINT32_1_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT32_1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT32_1_PlatInit = true;
-const bool ATTR_SCRATCH_UINT32_1_InitToZero = false;
-
-/* ATTR_SCRATCH_UINT32_2 */
-typedef uint32_t ATTR_SCRATCH_UINT32_2_Type;
-const bool ATTR_SCRATCH_UINT32_2_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT32_2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT32_2_PlatInit = true;
-const bool ATTR_SCRATCH_UINT32_2_InitToZero = false;
-
-/* ATTR_SCRATCH_UINT64_1 */
-typedef uint64_t ATTR_SCRATCH_UINT64_1_Type;
-const bool ATTR_SCRATCH_UINT64_1_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT64_1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT64_1_PlatInit = true;
-const bool ATTR_SCRATCH_UINT64_1_InitToZero = false;
-
-/* ATTR_SCRATCH_UINT64_2 */
-typedef uint64_t ATTR_SCRATCH_UINT64_2_Type;
-const bool ATTR_SCRATCH_UINT64_2_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT64_2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT64_2_PlatInit = true;
-const bool ATTR_SCRATCH_UINT64_2_InitToZero = false;
-enum ATTR_SCRATCH_UINT64_2_Enum
-{
-    ENUM_ATTR_SCRATCH_UINT64_2_VAL_A = 0ULL,
-    ENUM_ATTR_SCRATCH_UINT64_2_VAL_B = 5ULL,
-    ENUM_ATTR_SCRATCH_UINT64_2_VAL_C = 0xffffffffffffffffULL,
-};
-#define ATTR_SCRATCH_UINT64_2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_SCRATCH_INT8_1 */
-typedef int8_t ATTR_SCRATCH_INT8_1_Type;
-const bool ATTR_SCRATCH_INT8_1_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_INT8_1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_INT8_1_PlatInit = true;
-const bool ATTR_SCRATCH_INT8_1_InitToZero = false;
-#define ATTR_SCRATCH_INT8_1_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_SCRATCH_INT8_2 */
-typedef int8_t ATTR_SCRATCH_INT8_2_Type;
-const bool ATTR_SCRATCH_INT8_2_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_INT8_2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_INT8_2_PlatInit = true;
-const bool ATTR_SCRATCH_INT8_2_InitToZero = false;
-#define ATTR_SCRATCH_INT8_2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_SCRATCH_INT32_1 */
-typedef int32_t ATTR_SCRATCH_INT32_1_Type;
-const bool ATTR_SCRATCH_INT32_1_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_INT32_1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_INT32_1_PlatInit = true;
-const bool ATTR_SCRATCH_INT32_1_InitToZero = false;
-
-/* ATTR_SCRATCH_INT32_2 */
-typedef int32_t ATTR_SCRATCH_INT32_2_Type;
-const bool ATTR_SCRATCH_INT32_2_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_INT32_2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_INT32_2_PlatInit = true;
-const bool ATTR_SCRATCH_INT32_2_InitToZero = false;
-
-/* ATTR_SCRATCH_INT64_1 */
-typedef int64_t ATTR_SCRATCH_INT64_1_Type;
-const bool ATTR_SCRATCH_INT64_1_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_INT64_1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_INT64_1_PlatInit = true;
-const bool ATTR_SCRATCH_INT64_1_InitToZero = false;
-#define ATTR_SCRATCH_INT64_1_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_SCRATCH_INT64_2 */
-typedef int64_t ATTR_SCRATCH_INT64_2_Type;
-const bool ATTR_SCRATCH_INT64_2_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_INT64_2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_INT64_2_PlatInit = true;
-const bool ATTR_SCRATCH_INT64_2_InitToZero = false;
-enum ATTR_SCRATCH_INT64_2_Enum
-{
-    ENUM_ATTR_SCRATCH_INT64_2_VAL_A = 0,
-    ENUM_ATTR_SCRATCH_INT64_2_VAL_B = 5,
-    ENUM_ATTR_SCRATCH_INT64_2_VAL_C = 0xffffffffffffffff,
-};
-#define ATTR_SCRATCH_INT64_2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_SCRATCH_UINT32_ARRAY */
-typedef uint32_t ATTR_SCRATCH_UINT32_ARRAY_Type[64];
-const bool ATTR_SCRATCH_UINT32_ARRAY_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT32_ARRAY_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_SCRATCH_UINT32_ARRAY_PlatInit = true;
-const bool ATTR_SCRATCH_UINT32_ARRAY_InitToZero = false;
-
-/* ATTR_SCRATCH_UINT32_PERV_ARRAY */
-typedef uint32_t ATTR_SCRATCH_UINT32_PERV_ARRAY_Type[64];
-const bool ATTR_SCRATCH_UINT32_PERV_ARRAY_Privileged = false;
-const TargetTypes_t ATTR_SCRATCH_UINT32_PERV_ARRAY_TargetTypes = TARGET_TYPE_PERV;
-const bool ATTR_SCRATCH_UINT32_PERV_ARRAY_PlatInit = true;
-const bool ATTR_SCRATCH_UINT32_PERV_ARRAY_InitToZero = false;
-
-/* ATTR_REPR_RING */
-typedef uint32_t ATTR_REPR_RING_Type;
-const bool ATTR_REPR_RING_Privileged = false;
-const TargetTypes_t ATTR_REPR_RING_TargetTypes = TARGET_TYPE_PERV;
-const bool ATTR_REPR_RING_PlatInit = true;
-const bool ATTR_REPR_RING_InitToZero = false;
-#define ATTR_REPR_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_TIME_RING */
-typedef uint32_t ATTR_TIME_RING_Type;
-const bool ATTR_TIME_RING_Privileged = false;
-const TargetTypes_t ATTR_TIME_RING_TargetTypes = TARGET_TYPE_PERV;
-const bool ATTR_TIME_RING_PlatInit = true;
-const bool ATTR_TIME_RING_InitToZero = false;
-#define ATTR_TIME_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_GPTR_RING */
-typedef uint32_t ATTR_GPTR_RING_Type;
-const bool ATTR_GPTR_RING_Privileged = false;
-const TargetTypes_t ATTR_GPTR_RING_TargetTypes = TARGET_TYPE_PERV;
-const bool ATTR_GPTR_RING_PlatInit = true;
-const bool ATTR_GPTR_RING_InitToZero = false;
-#define ATTR_GPTR_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PLL_RING */
-typedef uint32_t ATTR_PLL_RING_Type;
-const bool ATTR_PLL_RING_Privileged = false;
-const TargetTypes_t ATTR_PLL_RING_TargetTypes = TARGET_TYPE_PERV;
-const bool ATTR_PLL_RING_PlatInit = true;
-const bool ATTR_PLL_RING_InitToZero = false;
-#define ATTR_PLL_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_CORE_REPR_RING */
-typedef uint32_t ATTR_CORE_REPR_RING_Type;
-const bool ATTR_CORE_REPR_RING_Privileged = false;
-const TargetTypes_t ATTR_CORE_REPR_RING_TargetTypes = TARGET_TYPE_CORE;
-const bool ATTR_CORE_REPR_RING_PlatInit = true;
-const bool ATTR_CORE_REPR_RING_InitToZero = false;
-
-/* ATTR_CORE_TIME_RING */
-typedef uint32_t ATTR_CORE_TIME_RING_Type;
-const bool ATTR_CORE_TIME_RING_Privileged = false;
-const TargetTypes_t ATTR_CORE_TIME_RING_TargetTypes = TARGET_TYPE_CORE;
-const bool ATTR_CORE_TIME_RING_PlatInit = true;
-const bool ATTR_CORE_TIME_RING_InitToZero = false;
-
-/* ATTR_CORE_GPTR_RING */
-typedef uint32_t ATTR_CORE_GPTR_RING_Type;
-const bool ATTR_CORE_GPTR_RING_Privileged = false;
-const TargetTypes_t ATTR_CORE_GPTR_RING_TargetTypes = TARGET_TYPE_CORE;
-const bool ATTR_CORE_GPTR_RING_PlatInit = true;
-const bool ATTR_CORE_GPTR_RING_InitToZero = false;
-
-/* ATTR_L2_REPR_RING */
-typedef uint32_t ATTR_L2_REPR_RING_Type;
-const bool ATTR_L2_REPR_RING_Privileged = false;
-const TargetTypes_t ATTR_L2_REPR_RING_TargetTypes = TARGET_TYPE_EX;
-const bool ATTR_L2_REPR_RING_PlatInit = true;
-const bool ATTR_L2_REPR_RING_InitToZero = false;
-#define ATTR_L2_REPR_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_L2_TIME_RING */
-typedef uint32_t ATTR_L2_TIME_RING_Type;
-const bool ATTR_L2_TIME_RING_Privileged = false;
-const TargetTypes_t ATTR_L2_TIME_RING_TargetTypes = TARGET_TYPE_EX;
-const bool ATTR_L2_TIME_RING_PlatInit = true;
-const bool ATTR_L2_TIME_RING_InitToZero = false;
-#define ATTR_L2_TIME_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_L2_GPTR_RING */
-typedef uint32_t ATTR_L2_GPTR_RING_Type;
-const bool ATTR_L2_GPTR_RING_Privileged = false;
-const TargetTypes_t ATTR_L2_GPTR_RING_TargetTypes = TARGET_TYPE_EX;
-const bool ATTR_L2_GPTR_RING_PlatInit = true;
-const bool ATTR_L2_GPTR_RING_InitToZero = false;
-#define ATTR_L2_GPTR_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_L3_REPR_RING */
-typedef uint32_t ATTR_L3_REPR_RING_Type;
-const bool ATTR_L3_REPR_RING_Privileged = false;
-const TargetTypes_t ATTR_L3_REPR_RING_TargetTypes = TARGET_TYPE_EX;
-const bool ATTR_L3_REPR_RING_PlatInit = true;
-const bool ATTR_L3_REPR_RING_InitToZero = false;
-#define ATTR_L3_REPR_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_L3_TIME_RING */
-typedef uint32_t ATTR_L3_TIME_RING_Type;
-const bool ATTR_L3_TIME_RING_Privileged = false;
-const TargetTypes_t ATTR_L3_TIME_RING_TargetTypes = TARGET_TYPE_EX;
-const bool ATTR_L3_TIME_RING_PlatInit = true;
-const bool ATTR_L3_TIME_RING_InitToZero = false;
-#define ATTR_L3_TIME_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_L3_GPTR_RING */
-typedef uint32_t ATTR_L3_GPTR_RING_Type;
-const bool ATTR_L3_GPTR_RING_Privileged = false;
-const TargetTypes_t ATTR_L3_GPTR_RING_TargetTypes = TARGET_TYPE_EX;
-const bool ATTR_L3_GPTR_RING_PlatInit = true;
-const bool ATTR_L3_GPTR_RING_InitToZero = false;
-#define ATTR_L3_GPTR_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_DPLL_RING */
-typedef uint32_t ATTR_DPLL_RING_Type;
-const bool ATTR_DPLL_RING_Privileged = false;
-const TargetTypes_t ATTR_DPLL_RING_TargetTypes = TARGET_TYPE_EQ;
-const bool ATTR_DPLL_RING_PlatInit = true;
-const bool ATTR_DPLL_RING_InitToZero = false;
-#define ATTR_DPLL_RING_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_FSI */
-typedef uint16_t ATTR_PG_FSI_Type;
-const bool ATTR_PG_FSI_Privileged = false;
-const TargetTypes_t ATTR_PG_FSI_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_FSI_PlatInit = false;
-const bool ATTR_PG_FSI_InitToZero = false;
-#define ATTR_PG_FSI_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_PRV */
-typedef uint16_t ATTR_PG_PRV_Type;
-const bool ATTR_PG_PRV_Privileged = false;
-const TargetTypes_t ATTR_PG_PRV_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_PRV_PlatInit = false;
-const bool ATTR_PG_PRV_InitToZero = false;
-#define ATTR_PG_PRV_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_N0 */
-typedef uint16_t ATTR_PG_N0_Type;
-const bool ATTR_PG_N0_Privileged = false;
-const TargetTypes_t ATTR_PG_N0_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_N0_PlatInit = false;
-const bool ATTR_PG_N0_InitToZero = false;
-#define ATTR_PG_N0_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_N1 */
-typedef uint16_t ATTR_PG_N1_Type;
-const bool ATTR_PG_N1_Privileged = false;
-const TargetTypes_t ATTR_PG_N1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_N1_PlatInit = false;
-const bool ATTR_PG_N1_InitToZero = false;
-#define ATTR_PG_N1_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_N2 */
-typedef uint16_t ATTR_PG_N2_Type;
-const bool ATTR_PG_N2_Privileged = false;
-const TargetTypes_t ATTR_PG_N2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_N2_PlatInit = false;
-const bool ATTR_PG_N2_InitToZero = false;
-#define ATTR_PG_N2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_N3 */
-typedef uint16_t ATTR_PG_N3_Type;
-const bool ATTR_PG_N3_Privileged = false;
-const TargetTypes_t ATTR_PG_N3_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_N3_PlatInit = false;
-const bool ATTR_PG_N3_InitToZero = false;
-#define ATTR_PG_N3_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_XB */
-typedef uint16_t ATTR_PG_XB_Type;
-const bool ATTR_PG_XB_Privileged = false;
-const TargetTypes_t ATTR_PG_XB_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_XB_PlatInit = false;
-const bool ATTR_PG_XB_InitToZero = false;
-#define ATTR_PG_XB_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_MC01 */
-typedef uint16_t ATTR_PG_MC01_Type;
-const bool ATTR_PG_MC01_Privileged = false;
-const TargetTypes_t ATTR_PG_MC01_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_MC01_PlatInit = false;
-const bool ATTR_PG_MC01_InitToZero = false;
-#define ATTR_PG_MC01_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_MC23 */
-typedef uint16_t ATTR_PG_MC23_Type;
-const bool ATTR_PG_MC23_Privileged = false;
-const TargetTypes_t ATTR_PG_MC23_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_MC23_PlatInit = false;
-const bool ATTR_PG_MC23_InitToZero = false;
-#define ATTR_PG_MC23_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_OB0 */
-typedef uint16_t ATTR_PG_OB0_Type;
-const bool ATTR_PG_OB0_Privileged = false;
-const TargetTypes_t ATTR_PG_OB0_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_OB0_PlatInit = false;
-const bool ATTR_PG_OB0_InitToZero = false;
-#define ATTR_PG_OB0_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_OB1 */
-typedef uint16_t ATTR_PG_OB1_Type;
-const bool ATTR_PG_OB1_Privileged = false;
-const TargetTypes_t ATTR_PG_OB1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_OB1_PlatInit = false;
-const bool ATTR_PG_OB1_InitToZero = false;
-#define ATTR_PG_OB1_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_OB2 */
-typedef uint16_t ATTR_PG_OB2_Type;
-const bool ATTR_PG_OB2_Privileged = false;
-const TargetTypes_t ATTR_PG_OB2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_OB2_PlatInit = false;
-const bool ATTR_PG_OB2_InitToZero = false;
-#define ATTR_PG_OB2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_OB3 */
-typedef uint16_t ATTR_PG_OB3_Type;
-const bool ATTR_PG_OB3_Privileged = false;
-const TargetTypes_t ATTR_PG_OB3_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_OB3_PlatInit = false;
-const bool ATTR_PG_OB3_InitToZero = false;
-#define ATTR_PG_OB3_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_PCI0 */
-typedef uint16_t ATTR_PG_PCI0_Type;
-const bool ATTR_PG_PCI0_Privileged = false;
-const TargetTypes_t ATTR_PG_PCI0_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_PCI0_PlatInit = false;
-const bool ATTR_PG_PCI0_InitToZero = false;
-#define ATTR_PG_PCI0_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_PCI1 */
-typedef uint16_t ATTR_PG_PCI1_Type;
-const bool ATTR_PG_PCI1_Privileged = false;
-const TargetTypes_t ATTR_PG_PCI1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_PCI1_PlatInit = false;
-const bool ATTR_PG_PCI1_InitToZero = false;
-#define ATTR_PG_PCI1_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_PCI2 */
-typedef uint16_t ATTR_PG_PCI2_Type;
-const bool ATTR_PG_PCI2_Privileged = false;
-const TargetTypes_t ATTR_PG_PCI2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_PCI2_PlatInit = false;
-const bool ATTR_PG_PCI2_InitToZero = false;
-#define ATTR_PG_PCI2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EQ0 */
-typedef uint16_t ATTR_PG_EQ0_Type;
-const bool ATTR_PG_EQ0_Privileged = false;
-const TargetTypes_t ATTR_PG_EQ0_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EQ0_PlatInit = false;
-const bool ATTR_PG_EQ0_InitToZero = false;
-#define ATTR_PG_EQ0_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EQ1 */
-typedef uint16_t ATTR_PG_EQ1_Type;
-const bool ATTR_PG_EQ1_Privileged = false;
-const TargetTypes_t ATTR_PG_EQ1_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EQ1_PlatInit = false;
-const bool ATTR_PG_EQ1_InitToZero = false;
-#define ATTR_PG_EQ1_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EQ2 */
-typedef uint16_t ATTR_PG_EQ2_Type;
-const bool ATTR_PG_EQ2_Privileged = false;
-const TargetTypes_t ATTR_PG_EQ2_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EQ2_PlatInit = false;
-const bool ATTR_PG_EQ2_InitToZero = false;
-#define ATTR_PG_EQ2_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EQ3 */
-typedef uint16_t ATTR_PG_EQ3_Type;
-const bool ATTR_PG_EQ3_Privileged = false;
-const TargetTypes_t ATTR_PG_EQ3_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EQ3_PlatInit = false;
-const bool ATTR_PG_EQ3_InitToZero = false;
-#define ATTR_PG_EQ3_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EQ4 */
-typedef uint16_t ATTR_PG_EQ4_Type;
-const bool ATTR_PG_EQ4_Privileged = false;
-const TargetTypes_t ATTR_PG_EQ4_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EQ4_PlatInit = false;
-const bool ATTR_PG_EQ4_InitToZero = false;
-#define ATTR_PG_EQ4_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EQ5 */
-typedef uint16_t ATTR_PG_EQ5_Type;
-const bool ATTR_PG_EQ5_Privileged = false;
-const TargetTypes_t ATTR_PG_EQ5_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EQ5_PlatInit = false;
-const bool ATTR_PG_EQ5_InitToZero = false;
-#define ATTR_PG_EQ5_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC00 */
-typedef uint16_t ATTR_PG_EC00_Type;
-const bool ATTR_PG_EC00_Privileged = false;
-const TargetTypes_t ATTR_PG_EC00_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC00_PlatInit = false;
-const bool ATTR_PG_EC00_InitToZero = false;
-#define ATTR_PG_EC00_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC01 */
-typedef uint16_t ATTR_PG_EC01_Type;
-const bool ATTR_PG_EC01_Privileged = false;
-const TargetTypes_t ATTR_PG_EC01_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC01_PlatInit = false;
-const bool ATTR_PG_EC01_InitToZero = false;
-#define ATTR_PG_EC01_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC02 */
-typedef uint16_t ATTR_PG_EC02_Type;
-const bool ATTR_PG_EC02_Privileged = false;
-const TargetTypes_t ATTR_PG_EC02_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC02_PlatInit = false;
-const bool ATTR_PG_EC02_InitToZero = false;
-#define ATTR_PG_EC02_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC03 */
-typedef uint16_t ATTR_PG_EC03_Type;
-const bool ATTR_PG_EC03_Privileged = false;
-const TargetTypes_t ATTR_PG_EC03_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC03_PlatInit = false;
-const bool ATTR_PG_EC03_InitToZero = false;
-#define ATTR_PG_EC03_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC04 */
-typedef uint16_t ATTR_PG_EC04_Type;
-const bool ATTR_PG_EC04_Privileged = false;
-const TargetTypes_t ATTR_PG_EC04_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC04_PlatInit = false;
-const bool ATTR_PG_EC04_InitToZero = false;
-#define ATTR_PG_EC04_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC05 */
-typedef uint16_t ATTR_PG_EC05_Type;
-const bool ATTR_PG_EC05_Privileged = false;
-const TargetTypes_t ATTR_PG_EC05_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC05_PlatInit = false;
-const bool ATTR_PG_EC05_InitToZero = false;
-#define ATTR_PG_EC05_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC06 */
-typedef uint16_t ATTR_PG_EC06_Type;
-const bool ATTR_PG_EC06_Privileged = false;
-const TargetTypes_t ATTR_PG_EC06_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC06_PlatInit = false;
-const bool ATTR_PG_EC06_InitToZero = false;
-#define ATTR_PG_EC06_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC07 */
-typedef uint16_t ATTR_PG_EC07_Type;
-const bool ATTR_PG_EC07_Privileged = false;
-const TargetTypes_t ATTR_PG_EC07_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC07_PlatInit = false;
-const bool ATTR_PG_EC07_InitToZero = false;
-#define ATTR_PG_EC07_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC08 */
-typedef uint16_t ATTR_PG_EC08_Type;
-const bool ATTR_PG_EC08_Privileged = false;
-const TargetTypes_t ATTR_PG_EC08_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC08_PlatInit = false;
-const bool ATTR_PG_EC08_InitToZero = false;
-#define ATTR_PG_EC08_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC09 */
-typedef uint16_t ATTR_PG_EC09_Type;
-const bool ATTR_PG_EC09_Privileged = false;
-const TargetTypes_t ATTR_PG_EC09_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC09_PlatInit = false;
-const bool ATTR_PG_EC09_InitToZero = false;
-#define ATTR_PG_EC09_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC10 */
-typedef uint16_t ATTR_PG_EC10_Type;
-const bool ATTR_PG_EC10_Privileged = false;
-const TargetTypes_t ATTR_PG_EC10_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC10_PlatInit = false;
-const bool ATTR_PG_EC10_InitToZero = false;
-#define ATTR_PG_EC10_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC11 */
-typedef uint16_t ATTR_PG_EC11_Type;
-const bool ATTR_PG_EC11_Privileged = false;
-const TargetTypes_t ATTR_PG_EC11_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC11_PlatInit = false;
-const bool ATTR_PG_EC11_InitToZero = false;
-#define ATTR_PG_EC11_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC12 */
-typedef uint16_t ATTR_PG_EC12_Type;
-const bool ATTR_PG_EC12_Privileged = false;
-const TargetTypes_t ATTR_PG_EC12_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC12_PlatInit = false;
-const bool ATTR_PG_EC12_InitToZero = false;
-#define ATTR_PG_EC12_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC13 */
-typedef uint16_t ATTR_PG_EC13_Type;
-const bool ATTR_PG_EC13_Privileged = false;
-const TargetTypes_t ATTR_PG_EC13_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC13_PlatInit = false;
-const bool ATTR_PG_EC13_InitToZero = false;
-#define ATTR_PG_EC13_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC14 */
-typedef uint16_t ATTR_PG_EC14_Type;
-const bool ATTR_PG_EC14_Privileged = false;
-const TargetTypes_t ATTR_PG_EC14_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC14_PlatInit = false;
-const bool ATTR_PG_EC14_InitToZero = false;
-#define ATTR_PG_EC14_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC15 */
-typedef uint16_t ATTR_PG_EC15_Type;
-const bool ATTR_PG_EC15_Privileged = false;
-const TargetTypes_t ATTR_PG_EC15_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC15_PlatInit = false;
-const bool ATTR_PG_EC15_InitToZero = false;
-#define ATTR_PG_EC15_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC16 */
-typedef uint16_t ATTR_PG_EC16_Type;
-const bool ATTR_PG_EC16_Privileged = false;
-const TargetTypes_t ATTR_PG_EC16_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC16_PlatInit = false;
-const bool ATTR_PG_EC16_InitToZero = false;
-#define ATTR_PG_EC16_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC17 */
-typedef uint16_t ATTR_PG_EC17_Type;
-const bool ATTR_PG_EC17_Privileged = false;
-const TargetTypes_t ATTR_PG_EC17_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC17_PlatInit = false;
-const bool ATTR_PG_EC17_InitToZero = false;
-#define ATTR_PG_EC17_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC18 */
-typedef uint16_t ATTR_PG_EC18_Type;
-const bool ATTR_PG_EC18_Privileged = false;
-const TargetTypes_t ATTR_PG_EC18_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC18_PlatInit = false;
-const bool ATTR_PG_EC18_InitToZero = false;
-#define ATTR_PG_EC18_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC19 */
-typedef uint16_t ATTR_PG_EC19_Type;
-const bool ATTR_PG_EC19_Privileged = false;
-const TargetTypes_t ATTR_PG_EC19_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC19_PlatInit = false;
-const bool ATTR_PG_EC19_InitToZero = false;
-#define ATTR_PG_EC19_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC20 */
-typedef uint16_t ATTR_PG_EC20_Type;
-const bool ATTR_PG_EC20_Privileged = false;
-const TargetTypes_t ATTR_PG_EC20_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC20_PlatInit = false;
-const bool ATTR_PG_EC20_InitToZero = false;
-#define ATTR_PG_EC20_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC21 */
-typedef uint16_t ATTR_PG_EC21_Type;
-const bool ATTR_PG_EC21_Privileged = false;
-const TargetTypes_t ATTR_PG_EC21_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC21_PlatInit = false;
-const bool ATTR_PG_EC21_InitToZero = false;
-#define ATTR_PG_EC21_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC22 */
-typedef uint16_t ATTR_PG_EC22_Type;
-const bool ATTR_PG_EC22_Privileged = false;
-const TargetTypes_t ATTR_PG_EC22_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC22_PlatInit = false;
-const bool ATTR_PG_EC22_InitToZero = false;
-#define ATTR_PG_EC22_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_PG_EC23 */
-typedef uint16_t ATTR_PG_EC23_Type;
-const bool ATTR_PG_EC23_Privileged = false;
-const TargetTypes_t ATTR_PG_EC23_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_PG_EC23_PlatInit = false;
-const bool ATTR_PG_EC23_InitToZero = false;
-#define ATTR_PG_EC23_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_CHIP_UNIT_POS */
-typedef uint8_t ATTR_CHIP_UNIT_POS_Type;
-const bool ATTR_CHIP_UNIT_POS_Privileged = false;
-const TargetTypes_t ATTR_CHIP_UNIT_POS_TargetTypes = TARGET_TYPE_PERV;
-const bool ATTR_CHIP_UNIT_POS_PlatInit = false;
-const bool ATTR_CHIP_UNIT_POS_InitToZero = false;
-#define ATTR_CHIP_UNIT_POS_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_FABRIC_SYSTEM_ID */
-typedef uint8_t ATTR_FABRIC_SYSTEM_ID_Type;
-const bool ATTR_FABRIC_SYSTEM_ID_Privileged = false;
-const TargetTypes_t ATTR_FABRIC_SYSTEM_ID_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_FABRIC_SYSTEM_ID_PlatInit = true;
-const bool ATTR_FABRIC_SYSTEM_ID_InitToZero = false;
-#define ATTR_FABRIC_SYSTEM_ID_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_SYSTEM_IPL_PHASE */
-typedef uint8_t ATTR_SYSTEM_IPL_PHASE_Type;
-const bool ATTR_SYSTEM_IPL_PHASE_Privileged = false;
-const TargetTypes_t ATTR_SYSTEM_IPL_PHASE_TargetTypes = TARGET_TYPE_SYSTEM;
-const bool ATTR_SYSTEM_IPL_PHASE_PlatInit = true;
-const bool ATTR_SYSTEM_IPL_PHASE_InitToZero = false;
-enum ATTR_SYSTEM_IPL_PHASE_Enum
-{
-    ENUM_ATTR_SYSTEM_IPL_PHASE_HB_IPL = 0x1,
-    ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME = 0x2,
-    ENUM_ATTR_SYSTEM_IPL_PHASE_CACHE_CONTAINED = 0x4,
-};
-#define ATTR_SYSTEM_IPL_PHASE_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_BACKUP_SEEPROM_SELECT */
-typedef uint8_t ATTR_BACKUP_SEEPROM_SELECT_Type;
-const bool ATTR_BACKUP_SEEPROM_SELECT_Privileged = false;
-const TargetTypes_t ATTR_BACKUP_SEEPROM_SELECT_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_BACKUP_SEEPROM_SELECT_PlatInit = false;
-const bool ATTR_BACKUP_SEEPROM_SELECT_InitToZero = false;
-#define ATTR_BACKUP_SEEPROM_SELECT_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-/* ATTR_MC_SYNC_MODE */
-typedef uint8_t ATTR_MC_SYNC_MODE_Type;
-const bool ATTR_MC_SYNC_MODE_Privileged = false;
-const TargetTypes_t ATTR_MC_SYNC_MODE_TargetTypes = TARGET_TYPE_PROC_CHIP;
-const bool ATTR_MC_SYNC_MODE_PlatInit = false;
-const bool ATTR_MC_SYNC_MODE_InitToZero = false;
-#define ATTR_MC_SYNC_MODE_SETMACRO ATTRIBUTE_NOT_WRITABLE
-
-} //fapi2 
-
-#endif // __ASSEMBLER__
-
-#endif
diff --git a/hwpf/include/fapi2AttributePlatCheck.H b/hwpf/include/fapi2AttributePlatCheck.H
deleted file mode 100644
index f02c02cc..00000000
--- a/hwpf/include/fapi2AttributePlatCheck.H
+++ /dev/null
@@ -1,361 +0,0 @@
-// fapiAttributePlatCheck.H
-// This file is generated by perl script fapiParseAttributeInfo.pl
-// A platform can include it to ensure that it handles all HWPF
-// attributes
-
-#ifndef FAPIATTRIBUTEPLATCHECK_H_
-#define FAPIATTRIBUTEPLATCHECK_H_
-
-#ifndef ATTR_SCRATCH_UINT8_1_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT8_1
-#endif
-#ifndef ATTR_SCRATCH_UINT8_1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT8_1
-#endif
-
-#ifndef ATTR_SCRATCH_UINT8_2_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT8_2
-#endif
-#ifndef ATTR_SCRATCH_UINT8_2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT8_2
-#endif
-
-#ifndef ATTR_SCRATCH_UINT32_1_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT32_1
-#endif
-#ifndef ATTR_SCRATCH_UINT32_1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT32_1
-#endif
-
-#ifndef ATTR_SCRATCH_UINT32_2_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT32_2
-#endif
-#ifndef ATTR_SCRATCH_UINT32_2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT32_2
-#endif
-
-#ifndef ATTR_SCRATCH_UINT64_1_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT64_1
-#endif
-#ifndef ATTR_SCRATCH_UINT64_1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT64_1
-#endif
-
-#ifndef ATTR_SCRATCH_UINT64_2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT64_2
-#endif
-
-#ifndef ATTR_SCRATCH_INT8_1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_INT8_1
-#endif
-
-#ifndef ATTR_SCRATCH_INT8_2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_INT8_2
-#endif
-
-#ifndef ATTR_SCRATCH_INT32_1_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_INT32_1
-#endif
-#ifndef ATTR_SCRATCH_INT32_1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_INT32_1
-#endif
-
-#ifndef ATTR_SCRATCH_INT32_2_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_INT32_2
-#endif
-#ifndef ATTR_SCRATCH_INT32_2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_INT32_2
-#endif
-
-#ifndef ATTR_SCRATCH_INT64_1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_INT64_1
-#endif
-
-#ifndef ATTR_SCRATCH_INT64_2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_INT64_2
-#endif
-
-#ifndef ATTR_SCRATCH_UINT32_ARRAY_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT32_ARRAY
-#endif
-#ifndef ATTR_SCRATCH_UINT32_ARRAY_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT32_ARRAY
-#endif
-
-#ifndef ATTR_SCRATCH_UINT32_PERV_ARRAY_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_SCRATCH_UINT32_PERV_ARRAY
-#endif
-#ifndef ATTR_SCRATCH_UINT32_PERV_ARRAY_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SCRATCH_UINT32_PERV_ARRAY
-#endif
-
-#ifndef ATTR_REPR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_REPR_RING
-#endif
-
-#ifndef ATTR_TIME_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_TIME_RING
-#endif
-
-#ifndef ATTR_GPTR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_GPTR_RING
-#endif
-
-#ifndef ATTR_PLL_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PLL_RING
-#endif
-
-#ifndef ATTR_CORE_REPR_RING_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_CORE_REPR_RING
-#endif
-#ifndef ATTR_CORE_REPR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_CORE_REPR_RING
-#endif
-
-#ifndef ATTR_CORE_TIME_RING_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_CORE_TIME_RING
-#endif
-#ifndef ATTR_CORE_TIME_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_CORE_TIME_RING
-#endif
-
-#ifndef ATTR_CORE_GPTR_RING_SETMACRO
-#error Platform does not support set of HWPF attr ATTR_CORE_GPTR_RING
-#endif
-#ifndef ATTR_CORE_GPTR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_CORE_GPTR_RING
-#endif
-
-#ifndef ATTR_L2_REPR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_L2_REPR_RING
-#endif
-
-#ifndef ATTR_L2_TIME_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_L2_TIME_RING
-#endif
-
-#ifndef ATTR_L2_GPTR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_L2_GPTR_RING
-#endif
-
-#ifndef ATTR_L3_REPR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_L3_REPR_RING
-#endif
-
-#ifndef ATTR_L3_TIME_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_L3_TIME_RING
-#endif
-
-#ifndef ATTR_L3_GPTR_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_L3_GPTR_RING
-#endif
-
-#ifndef ATTR_DPLL_RING_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_DPLL_RING
-#endif
-
-#ifndef ATTR_PG_FSI_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_FSI
-#endif
-
-#ifndef ATTR_PG_PRV_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_PRV
-#endif
-
-#ifndef ATTR_PG_N0_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_N0
-#endif
-
-#ifndef ATTR_PG_N1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_N1
-#endif
-
-#ifndef ATTR_PG_N2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_N2
-#endif
-
-#ifndef ATTR_PG_N3_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_N3
-#endif
-
-#ifndef ATTR_PG_XB_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_XB
-#endif
-
-#ifndef ATTR_PG_MC01_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_MC01
-#endif
-
-#ifndef ATTR_PG_MC23_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_MC23
-#endif
-
-#ifndef ATTR_PG_OB0_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_OB0
-#endif
-
-#ifndef ATTR_PG_OB1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_OB1
-#endif
-
-#ifndef ATTR_PG_OB2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_OB2
-#endif
-
-#ifndef ATTR_PG_OB3_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_OB3
-#endif
-
-#ifndef ATTR_PG_PCI0_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_PCI0
-#endif
-
-#ifndef ATTR_PG_PCI1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_PCI1
-#endif
-
-#ifndef ATTR_PG_PCI2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_PCI2
-#endif
-
-#ifndef ATTR_PG_EQ0_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EQ0
-#endif
-
-#ifndef ATTR_PG_EQ1_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EQ1
-#endif
-
-#ifndef ATTR_PG_EQ2_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EQ2
-#endif
-
-#ifndef ATTR_PG_EQ3_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EQ3
-#endif
-
-#ifndef ATTR_PG_EQ4_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EQ4
-#endif
-
-#ifndef ATTR_PG_EQ5_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EQ5
-#endif
-
-#ifndef ATTR_PG_EC00_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC00
-#endif
-
-#ifndef ATTR_PG_EC01_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC01
-#endif
-
-#ifndef ATTR_PG_EC02_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC02
-#endif
-
-#ifndef ATTR_PG_EC03_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC03
-#endif
-
-#ifndef ATTR_PG_EC04_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC04
-#endif
-
-#ifndef ATTR_PG_EC05_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC05
-#endif
-
-#ifndef ATTR_PG_EC06_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC06
-#endif
-
-#ifndef ATTR_PG_EC07_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC07
-#endif
-
-#ifndef ATTR_PG_EC08_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC08
-#endif
-
-#ifndef ATTR_PG_EC09_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC09
-#endif
-
-#ifndef ATTR_PG_EC10_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC10
-#endif
-
-#ifndef ATTR_PG_EC11_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC11
-#endif
-
-#ifndef ATTR_PG_EC12_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC12
-#endif
-
-#ifndef ATTR_PG_EC13_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC13
-#endif
-
-#ifndef ATTR_PG_EC14_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC14
-#endif
-
-#ifndef ATTR_PG_EC15_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC15
-#endif
-
-#ifndef ATTR_PG_EC16_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC16
-#endif
-
-#ifndef ATTR_PG_EC17_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC17
-#endif
-
-#ifndef ATTR_PG_EC18_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC18
-#endif
-
-#ifndef ATTR_PG_EC19_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC19
-#endif
-
-#ifndef ATTR_PG_EC20_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC20
-#endif
-
-#ifndef ATTR_PG_EC21_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC21
-#endif
-
-#ifndef ATTR_PG_EC22_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC22
-#endif
-
-#ifndef ATTR_PG_EC23_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_PG_EC23
-#endif
-
-#ifndef ATTR_CHIP_UNIT_POS_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_CHIP_UNIT_POS
-#endif
-
-#ifndef ATTR_FABRIC_SYSTEM_ID_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_FABRIC_SYSTEM_ID
-#endif
-
-#ifndef ATTR_SYSTEM_IPL_PHASE_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_SYSTEM_IPL_PHASE
-#endif
-
-#ifndef ATTR_BACKUP_SEEPROM_SELECT_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_BACKUP_SEEPROM_SELECT
-#endif
-
-#ifndef ATTR_MC_SYNC_MODE_GETMACRO
-#error Platform does not support get of HWPF attr ATTR_MC_SYNC_MODE
-#endif
-
-#endif
diff --git a/hwpf/include/fapi2AttributeService.C b/hwpf/include/fapi2AttributeService.C
deleted file mode 100644
index c58e7a62..00000000
--- a/hwpf/include/fapi2AttributeService.C
+++ /dev/null
@@ -1,519 +0,0 @@
-// fapi2AttributeService.C
-// This file is generated by perl script fapi2CreateIfAttrService.pl
-
-#include <fapi2AttributeService.H>
-//#include <fapi2ChipEcFeature.H>
-//#include <fapi2PlatTrace.H>
-
-namespace fapi2
-{
-
-ReturnCode fapiGetInitFileAttr(const AttributeId i_id,
-                               const Target * i_pTarget,
-                               uint64_t & o_val,
-                               const uint32_t i_arrayIndex1,
-                               const uint32_t i_arrayIndex2,
-                               const uint32_t i_arrayIndex3,
-                               const uint32_t i_arrayIndex4)
-{
-    ReturnCode l_rc;
-
-    if (i_id == ATTR_SCRATCH_UINT8_1)
-    {
-        ATTR_SCRATCH_UINT8_1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT8_1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_UINT8_2)
-    {
-        ATTR_SCRATCH_UINT8_2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT8_2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_UINT32_1)
-    {
-        ATTR_SCRATCH_UINT32_1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT32_1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_UINT32_2)
-    {
-        ATTR_SCRATCH_UINT32_2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT32_2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_UINT64_1)
-    {
-        ATTR_SCRATCH_UINT64_1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT64_1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_UINT64_2)
-    {
-        ATTR_SCRATCH_UINT64_2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT64_2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_INT8_1)
-    {
-        ATTR_SCRATCH_INT8_1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_INT8_1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_INT8_2)
-    {
-        ATTR_SCRATCH_INT8_2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_INT8_2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_INT32_1)
-    {
-        ATTR_SCRATCH_INT32_1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_INT32_1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_INT32_2)
-    {
-        ATTR_SCRATCH_INT32_2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_INT32_2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_INT64_1)
-    {
-        ATTR_SCRATCH_INT64_1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_INT64_1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_INT64_2)
-    {
-        ATTR_SCRATCH_INT64_2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_INT64_2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SCRATCH_UINT32_ARRAY)
-    {
-        ATTR_SCRATCH_UINT32_ARRAY_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT32_ARRAY, i_pTarget, l_attr);
-        o_val = l_attr[i_arrayIndex1];
-    }
-    else if (i_id == ATTR_SCRATCH_UINT32_PERV_ARRAY)
-    {
-        ATTR_SCRATCH_UINT32_PERV_ARRAY_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SCRATCH_UINT32_PERV_ARRAY, i_pTarget, l_attr);
-        o_val = l_attr[i_arrayIndex1];
-    }
-    else if (i_id == ATTR_REPR_RING)
-    {
-        ATTR_REPR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_REPR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_TIME_RING)
-    {
-        ATTR_TIME_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_TIME_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_GPTR_RING)
-    {
-        ATTR_GPTR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_GPTR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PLL_RING)
-    {
-        ATTR_PLL_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PLL_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_CORE_REPR_RING)
-    {
-        ATTR_CORE_REPR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_CORE_REPR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_CORE_TIME_RING)
-    {
-        ATTR_CORE_TIME_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_CORE_TIME_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_CORE_GPTR_RING)
-    {
-        ATTR_CORE_GPTR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_CORE_GPTR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_L2_REPR_RING)
-    {
-        ATTR_L2_REPR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_L2_REPR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_L2_TIME_RING)
-    {
-        ATTR_L2_TIME_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_L2_TIME_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_L2_GPTR_RING)
-    {
-        ATTR_L2_GPTR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_L2_GPTR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_L3_REPR_RING)
-    {
-        ATTR_L3_REPR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_L3_REPR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_L3_TIME_RING)
-    {
-        ATTR_L3_TIME_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_L3_TIME_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_L3_GPTR_RING)
-    {
-        ATTR_L3_GPTR_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_L3_GPTR_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_DPLL_RING)
-    {
-        ATTR_DPLL_RING_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_DPLL_RING, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_FSI)
-    {
-        ATTR_PG_FSI_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_FSI, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_PRV)
-    {
-        ATTR_PG_PRV_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_PRV, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_N0)
-    {
-        ATTR_PG_N0_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_N0, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_N1)
-    {
-        ATTR_PG_N1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_N1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_N2)
-    {
-        ATTR_PG_N2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_N2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_N3)
-    {
-        ATTR_PG_N3_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_N3, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_XB)
-    {
-        ATTR_PG_XB_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_XB, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_MC01)
-    {
-        ATTR_PG_MC01_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_MC01, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_MC23)
-    {
-        ATTR_PG_MC23_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_MC23, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_OB0)
-    {
-        ATTR_PG_OB0_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_OB0, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_OB1)
-    {
-        ATTR_PG_OB1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_OB1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_OB2)
-    {
-        ATTR_PG_OB2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_OB2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_OB3)
-    {
-        ATTR_PG_OB3_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_OB3, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_PCI0)
-    {
-        ATTR_PG_PCI0_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_PCI0, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_PCI1)
-    {
-        ATTR_PG_PCI1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_PCI1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_PCI2)
-    {
-        ATTR_PG_PCI2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_PCI2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EQ0)
-    {
-        ATTR_PG_EQ0_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EQ0, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EQ1)
-    {
-        ATTR_PG_EQ1_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EQ1, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EQ2)
-    {
-        ATTR_PG_EQ2_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EQ2, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EQ3)
-    {
-        ATTR_PG_EQ3_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EQ3, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EQ4)
-    {
-        ATTR_PG_EQ4_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EQ4, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EQ5)
-    {
-        ATTR_PG_EQ5_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EQ5, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC00)
-    {
-        ATTR_PG_EC00_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC00, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC01)
-    {
-        ATTR_PG_EC01_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC01, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC02)
-    {
-        ATTR_PG_EC02_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC02, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC03)
-    {
-        ATTR_PG_EC03_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC03, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC04)
-    {
-        ATTR_PG_EC04_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC04, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC05)
-    {
-        ATTR_PG_EC05_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC05, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC06)
-    {
-        ATTR_PG_EC06_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC06, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC07)
-    {
-        ATTR_PG_EC07_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC07, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC08)
-    {
-        ATTR_PG_EC08_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC08, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC09)
-    {
-        ATTR_PG_EC09_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC09, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC10)
-    {
-        ATTR_PG_EC10_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC10, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC11)
-    {
-        ATTR_PG_EC11_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC11, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC12)
-    {
-        ATTR_PG_EC12_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC12, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC13)
-    {
-        ATTR_PG_EC13_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC13, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC14)
-    {
-        ATTR_PG_EC14_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC14, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC15)
-    {
-        ATTR_PG_EC15_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC15, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC16)
-    {
-        ATTR_PG_EC16_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC16, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC17)
-    {
-        ATTR_PG_EC17_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC17, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC18)
-    {
-        ATTR_PG_EC18_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC18, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC19)
-    {
-        ATTR_PG_EC19_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC19, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC20)
-    {
-        ATTR_PG_EC20_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC20, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC21)
-    {
-        ATTR_PG_EC21_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC21, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC22)
-    {
-        ATTR_PG_EC22_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC22, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_PG_EC23)
-    {
-        ATTR_PG_EC23_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_PG_EC23, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_CHIP_UNIT_POS)
-    {
-        ATTR_CHIP_UNIT_POS_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_FABRIC_SYSTEM_ID)
-    {
-        ATTR_FABRIC_SYSTEM_ID_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_FABRIC_SYSTEM_ID, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_SYSTEM_IPL_PHASE)
-    {
-        ATTR_SYSTEM_IPL_PHASE_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_SYSTEM_IPL_PHASE, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_BACKUP_SEEPROM_SELECT)
-    {
-        ATTR_BACKUP_SEEPROM_SELECT_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_BACKUP_SEEPROM_SELECT, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else if (i_id == ATTR_MC_SYNC_MODE)
-    {
-        ATTR_MC_SYNC_MODE_Type l_attr;
-        l_rc = FAPI_ATTR_GET(ATTR_MC_SYNC_MODE, i_pTarget, l_attr);
-        o_val = l_attr;
-    }
-    else
-    {
-        FAPI_ERR("fapiGetInitFileAttr: Unrecognized attr ID: 0x%x", i_id);
-        l_rc.setFapiError(FAPI_RC_INVALID_ATTR_GET);
-        l_rc.addEIFfdc(0, &i_id, sizeof(i_id));
-    }
-
-    if (l_rc)
-    {
-        if (i_pTarget)
-        {
-            FAPI_ERR("fapiGetInitFileAttr: Error getting attr ID 0x%x from targType 0x%x",
-                     i_id, i_pTarget->getType());
-        }
-        else
-        {
-            FAPI_ERR("fapiGetInitFileAttr: Error getting attr ID 0x%x from system target",
-                     i_id);
-        }
-    }
-
-    return l_rc;
-}
-
-}
diff --git a/hwpf/include/fapi2AttributesSupported.html b/hwpf/include/fapi2AttributesSupported.html
deleted file mode 100644
index e07a7874..00000000
--- a/hwpf/include/fapi2AttributesSupported.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-
-<!-- fapiAttributesSupported.html -->
-<!-- This file is generated by perl script fapiParseAttributeInfo.pl -->
-<!-- It lists all HWPF attributes supported -->
-
-<h4>HWPF Attributes supported by this build.</h4>
-<table border="4">
-<tr><th>Attribute ID</th><th>Attribute Description</th></tr></table>
-
-</body>
-</html>
diff --git a/hwpf/include/fapi2ChipEcFeature.C b/hwpf/include/fapi2ChipEcFeature.C
deleted file mode 100644
index 820cf775..00000000
--- a/hwpf/include/fapi2ChipEcFeature.C
+++ /dev/null
@@ -1,75 +0,0 @@
-// fapiChipEcFeature.C
-// This file is generated by perl script fapiParseAttributeInfo.pl
-// It implements the fapiQueryChipEcFeature function
-
-#include <fapiChipEcFeature.H>
-#include <fapiAttributeService.H>
-#include <fapiSystemConfig.H>
-#include <fapiPlatTrace.H>
-
-namespace fapi2
-{
-
-fapi::ReturnCode fapiQueryChipEcFeature(fapi::AttributeId i_id,
-                                        const fapi::Target * i_pTarget,
-                                        uint8_t & o_hasFeature)
-{
-    o_hasFeature = false;
-    fapi::ReturnCode l_rc;
-    uint8_t l_chipName = 0;
-    uint8_t l_chipEc = 0;
-    fapi::Target l_target = *i_pTarget;
-
-    if (i_pTarget->isChiplet())
-    {
-        l_rc = fapiGetParentChip(*i_pTarget, l_target);
-
-        if (l_rc)
-        {
-            FAPI_ERR("fapiQueryChipEcFeature: error getting parent chip");
-        }
-    }
-
-    if (!l_rc)
-    {
-        l_rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_NAME, &l_target, l_chipName);
-
-        if (l_rc)
-        {
-            FAPI_ERR("fapiQueryChipEcFeature: error getting chip name");
-        }
-        else
-        {
-            l_rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_EC, &l_target, l_chipEc);
-
-            if (l_rc)
-            {
-                FAPI_ERR("fapiQueryChipEcFeature: error getting chip ec");
-            }
-            else
-            {
-                switch (i_id)
-                {
-                default:
-                    FAPI_ERR("fapiQueryChipEcFeature: Unknown feature 0x%x",
-                        i_id);
-                    l_rc.setFapiError(FAPI_RC_INVALID_CHIP_EC_FEATURE_GET);
-                    l_rc.addEIFfdc(0, &i_id, sizeof(i_id));
-                    break;
-                }
-
-                if (o_hasFeature)
-                {
-                    FAPI_INF("fapiQueryChipEcFeature: Chip (0x%x:0x%x) has feature (0x%x)", l_chipName, l_chipEc, i_id);
-                }
-                else
-                {
-                    FAPI_INF("fapiQueryChipEcFeature: Chip (0x%x:0x%x) does not have feature (0x%x)", l_chipName, l_chipEc, i_id);
-                }
-            }
-        }
-    }
-    return l_rc;
-}
-
-}
diff --git a/hwpf/include/fapi2PlatAttributeService.H b/hwpf/include/fapi2PlatAttributeService.H
deleted file mode 100644
index ae21a5f7..00000000
--- a/hwpf/include/fapi2PlatAttributeService.H
+++ /dev/null
@@ -1,1575 +0,0 @@
-/**
- *  @file fapiPlatAttributeService.H
- *
- *  @brief Defines the PLAT attribute access macros and defines which macro
- *         handles each attribute.
- *
- */
-
-
-#ifndef FAPI2PLATATTRIBUTESERVICE_H_
-#define FAPI2PLATATTRIBUTESERVICE_H_
-
-#include <stdint.h>
-#include <stddef.h>
-#include <fapi2AttributeIds.H>
-#include <plat_includes.H>
-#include "proc_sbe_fixed.H"
-#include "plat_target_parms.H"
-
-#define PLAT_GET_CHIP_EC_FEATURE_OVERRIDE(ID, PTARGET, VAL) \
-      _getEcFeatureOverride<ID##_Type>(ID, PTARGET, VAL)
-
-/* INSERT NEW ATTRIBUTES HERE */
-
-#define ATTR_BACKUP_SEEPROM_SELECT_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_CHIP_UNIT_POS_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_CORE_GPTR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_CORE_GPTR_RING_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_CORE_REPR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_CORE_REPR_RING_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_CORE_TIME_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_CORE_TIME_RING_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_DPLL_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_FABRIC_SYSTEM_ID_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_GPTR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_L2_GPTR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_L2_REPR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_L2_TIME_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_L3_GPTR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_L3_REPR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_L3_TIME_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_MC_SYNC_MODE_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC00_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC01_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC02_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC03_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC04_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC05_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC06_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC07_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC08_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC09_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC10_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC11_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC12_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC13_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC14_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC15_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC16_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC17_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC18_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC19_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC20_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC21_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC22_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EC23_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EQ0_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EQ1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EQ2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EQ3_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EQ4_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_EQ5_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_FSI_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_MC01_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_MC23_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_N0_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_N1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_N2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_N3_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_OB0_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_OB1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_OB2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_OB3_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_PCI0_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_PCI1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_PCI2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_PRV_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PG_XB_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_PLL_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_REPR_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_INT32_1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_INT32_1_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SCRATCH_INT32_2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_INT32_2_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SCRATCH_INT64_1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_INT64_2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_INT8_1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_INT8_2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT32_1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT32_1_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT32_2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT32_2_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT32_ARRAY_GETMACRO PLAT_ATTR_GET_UINT32_1D_ARRAY
-#define ATTR_SCRATCH_UINT32_ARRAY_SETMACRO PLAT_ATTR_SET_UINT32_1D_ARRAY
-#define ATTR_SCRATCH_UINT32_PERV_ARRAY_GETMACRO PLAT_ATTR_GET_UINT32_1D_ARRAY
-#define ATTR_SCRATCH_UINT32_PERV_ARRAY_SETMACRO PLAT_ATTR_SET_UINT32_1D_ARRAY
-#define ATTR_SCRATCH_UINT64_1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT64_1_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT64_2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT8_1_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT8_1_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT8_2_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_SCRATCH_UINT8_2_SETMACRO PLAT_ATTR_SET_GLOBAL_INT
-#define ATTR_SYSTEM_IPL_PHASE_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-#define ATTR_TIME_RING_GETMACRO PLAT_ATTR_GET_GLOBAL_INT
-
-
-/******************************************************************************/
-/*                          * Global macros *                                 */
-/* These macros are called by the macros above to invoke the appropriate API. */
-/* These macros do not need to change when a new attribute is introduced.     */
-/******************************************************************************/
-
-/* global get uint8_t 1D array macro */
-#define PLAT_ATTR_GET_UINT8_1D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
-            (ID, PTARGET, VAL)
-
-/* global set uint8_t 1D array macro */
-#define PLAT_ATTR_SET_UINT8_1D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
-            (ID, PTARGET, VAL)
-
-/* global get uint8_t 2D array macro */
-#define PLAT_ATTR_GET_UINT8_2D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayShort(ID, PTARGET, VAL[0])
-/* global set uint8_t 2D array macro */
-#define PLAT_ATTR_SET_UINT8_2D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayShort(ID, PTARGET, VAL[0])
-
-/* global get uint8_t 3D array macro */
-#define PLAT_ATTR_GET_UINT8_3D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayShort(ID, PTARGET, VAL[0][0])
-/* global set uint8_t 3D array macro */
-#define PLAT_ATTR_SET_UINT8_3D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayShort(ID, PTARGET, VAL[0][0])
-
-/* global get uint8_t 4D array macro */
-#define PLAT_ATTR_GET_UINT8_4D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayShort(ID, PTARGET, VAL[0][0][0])
-/* global set uint8_t 4D array macro */
-#define PLAT_ATTR_SET_UINT8_4D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayShort(ID, PTARGET, VAL[0][0][0])
-
-/* global get uint32_t 1D array macro */
-#define PLAT_ATTR_GET_UINT32_1D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayWord(ID, PTARGET, VAL)
-/* global set uint32_t 1D array macro */
-#define PLAT_ATTR_SET_UINT32_1D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayWord(ID, PTARGET, VAL)
-
-/* global get uint32_t 2D array macro */
-#define PLAT_ATTR_GET_UINT32_2D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayWord(ID, PTARGET, VAL[0])
-/* global set uint32_t 2D array macro */
-#define PLAT_ATTR_SET_UINT32_2D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayWord(ID, PTARGET, VAL[0])
-
-/* global get uint32_t 3D array macro */
-#define PLAT_ATTR_GET_UINT32_3D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayWord(ID, PTARGET, VAL[0][0])
-/* global set uint32_t 3D array macro */
-#define PLAT_ATTR_SET_UINT32_3D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayWord(ID, PTARGET, VAL[0][0])
-
-/* global get uint32_t 4D array macro */
-#define PLAT_ATTR_GET_UINT32_4D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayWord(ID, PTARGET, VAL[0][0][0])
-/* global set uint32_t 4D array macro */
-#define PLAT_ATTR_SET_UINT32_4D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayWord(ID, PTARGET, VAL[0][0][0])
-
-
-/* global get uint64_t 1D array macro */
-#define PLAT_ATTR_GET_UINT64_1D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayDoubleWord(ID, PTARGET, VAL)
-/* global set uint64_t 1D array macro */
-#define PLAT_ATTR_SET_UINT64_1D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayDoubleWord(ID, PTARGET, VAL)
-
-/* global get uint64_t 2D array macro */
-#define PLAT_ATTR_GET_UINT64_2D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayDoubleWord(ID, PTARGET, VAL[0])
-/* global set uint64_t 2D array macro */
-#define PLAT_ATTR_SET_UINT64_2D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayDoubleWord(ID, PTARGET, VAL[0])
-
-/* global get uint64_t 3D array macro */
-#define PLAT_ATTR_GET_UINT64_3D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayDoubleWord(ID, PTARGET, VAL[0][0])
-/* global set uint64_t 3D array macro */
-#define PLAT_ATTR_SET_UINT64_3D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayDoubleWord(ID, PTARGET, VAL[0][0])
-
-/* global get uint64_t 4D array macro */
-#define PLAT_ATTR_GET_UINT64_4D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeArrayDoubleWord(ID, PTARGET, VAL[0][0][0])
-/* global set uint64_t 4D array macro */
-#define PLAT_ATTR_SET_UINT64_4D_ARRAY(ID, PTARGET, VAL) \
-     _setAttributeArrayDoubleWord(ID, PTARGET, VAL[0][0][0])
-
-/* global get int macro (uint8_t, 16, 32 and 64) */
-#define PLAT_ATTR_GET_GLOBAL_INT(ID, PTARGET, VAL) \
-     _get<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
-                (ID, PTARGET, VAL)
-
-/* global set int macro (uint8_t, 16, 32 and 64) */
-#define PLAT_ATTR_SET_GLOBAL_INT(ID, PTARGET, VAL) \
-     _set<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
-                (ID, PTARGET, VAL)
-
-
-//here
-
-/******************************************************************************/
-// Get Override Macros
-/******************************************************************************/
-/* global get override uint8_t 1D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT8_1D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayShort(ID, PTARGET, VAL)
-/* global get override uint8_t 2D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT8_2D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayShort(ID, PTARGET, VAL[0])
-/* global get override uint8_t 3D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT8_3D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayShort(ID, PTARGET, VAL[0][0])
-/* global get override uint8_t 4D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT8_4D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayShort(ID, PTARGET, VAL[0][0][0])
-
-
-/* global get override uint32_t 1D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT32_1D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayWord(ID, PTARGET, VAL)
-/* global get override uint32_t 2D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT32_2D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayWord(ID, PTARGET, VAL[0])
-/* global get override uint32_t 3D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT32_3D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayWord(ID, PTARGET, VAL[0][0])
-/* global get override uint32_t 4D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT32_4D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayWord(ID, PTARGET, VAL[0][0][0])
-
-
-/* global get override uint64_t 1D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT64_1D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayDoubleWord(ID, PTARGET, VAL)
-/* global get override uint64_t 2D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT64_2D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayDoubleWord(ID, PTARGET, VAL[0])
-/* global get override uint64_t 3D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT64_3D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayDoubleWord(ID, PTARGET, VAL[0][0])
-/* global get override uint64_t 4D array macro */
-#define PLAT_ATTR_GET_OVERRIDE_UINT64_4D_ARRAY(ID, PTARGET, VAL) \
-     _getAttributeOverrideArrayDoubleWord(ID, PTARGET, VAL[0][0][0])
-
-/* global get override int macro (uint8_t, 32 and 64) */
-#define PLAT_ATTR_GET_OVERRIDE_GLOBAL_INT(ID, PTARGET, VAL) \
-     _getOverride<ID##_Type>(ID, PTARGET, VAL)
-
-/******************************************************************************/
-// Get string
-/******************************************************************************/
-
-extern "C"
-{
-    extern fapi2attr::SystemAttributes_t    G_system_attributes    asm("G_system_attributes")     __attribute__ ((section (".fixed")));
-    extern fapi2attr::ProcChipAttributes_t  G_proc_chip_attributes asm("G_proc_chip_attributes")  __attribute__ ((section (".fixed")));
-    extern fapi2attr::PervAttributes_t      G_perv_attributes      asm("G_perv_attributes")       __attribute__ ((section (".fixed")));
-    extern fapi2attr::CoreAttributes_t      G_core_attributes      asm("G_core_attributes")       __attribute__ ((section (".fixed")));
-    extern fapi2attr::EQAttributes_t        G_eq_attributes        asm("G_eq_attributes")         __attribute__ ((section (".fixed")));
-    extern fapi2attr::EXAttributes_t        G_ex_attributes        asm("G_ex_attributes")         __attribute__ ((section (".fixed")));
-
-    extern fapi2attr::SystemAttributes_t*   G_system_attributes_ptr;
-    extern fapi2attr::ProcChipAttributes_t* G_proc_chip_attributes_ptr;
-    extern fapi2attr::PervAttributes_t*     G_perv_attributes_ptr;
-    extern fapi2attr::CoreAttributes_t*     G_core_attributes_ptr;
-    extern fapi2attr::EQAttributes_t*       G_eq_attributes_ptr;
-    extern fapi2attr::EXAttributes_t*       G_ex_attributes_ptr;
-
-}
-
-namespace fapi2
-{
-
-
-// Parameters are done as pointers (vs references) to allow the attribute
-// storage to be relocated
-template<TargetType K, typename TAttrStruct, typename TValue, AttributeId AId>
-void __set( const Target<K>& i_ptarget, TAttrStruct* object, const AttributeId attrid, const TValue& value );
-
-template<TargetType K, typename TAttrStruct, typename TValue, AttributeId AId>
-void __get( const Target<K>& i_ptarget, const TAttrStruct* object, const AttributeId attrid, TValue* value );
-
-
-/* INSERT NEW GETTER AND SETTER FUNCTIONS HERE */
-
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_BACKUP_SEEPROM_SELECT>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint8_t, fapi2::ATTR_CHIP_UNIT_POS>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, const fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_CORE, fapi2attr::CoreAttributes_t, uint32_t, fapi2::ATTR_CORE_GPTR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_ptarget, const fapi2attr::CoreAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_CORE, fapi2attr::CoreAttributes_t, uint32_t, fapi2::ATTR_CORE_GPTR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_ptarget, fapi2attr::CoreAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_CORE, fapi2attr::CoreAttributes_t, uint32_t, fapi2::ATTR_CORE_REPR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_ptarget, const fapi2attr::CoreAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_CORE, fapi2attr::CoreAttributes_t, uint32_t, fapi2::ATTR_CORE_REPR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_ptarget, fapi2attr::CoreAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_CORE, fapi2attr::CoreAttributes_t, uint32_t, fapi2::ATTR_CORE_TIME_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_ptarget, const fapi2attr::CoreAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_CORE, fapi2attr::CoreAttributes_t, uint32_t, fapi2::ATTR_CORE_TIME_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_ptarget, fapi2attr::CoreAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EQ, fapi2attr::EQAttributes_t, uint32_t, fapi2::ATTR_DPLL_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EQ>& i_ptarget, const fapi2attr::EQAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_FABRIC_SYSTEM_ID>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint32_t, fapi2::ATTR_GPTR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, const fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EX, fapi2attr::EXAttributes_t, uint32_t, fapi2::ATTR_L2_GPTR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EX>& i_ptarget, const fapi2attr::EXAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EX, fapi2attr::EXAttributes_t, uint32_t, fapi2::ATTR_L2_REPR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EX>& i_ptarget, const fapi2attr::EXAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EX, fapi2attr::EXAttributes_t, uint32_t, fapi2::ATTR_L2_TIME_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EX>& i_ptarget, const fapi2attr::EXAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EX, fapi2attr::EXAttributes_t, uint32_t, fapi2::ATTR_L3_GPTR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EX>& i_ptarget, const fapi2attr::EXAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EX, fapi2attr::EXAttributes_t, uint32_t, fapi2::ATTR_L3_REPR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EX>& i_ptarget, const fapi2attr::EXAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_EX, fapi2attr::EXAttributes_t, uint32_t, fapi2::ATTR_L3_TIME_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_EX>& i_ptarget, const fapi2attr::EXAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_MC_SYNC_MODE>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC00>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC01>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC02>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC03>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC04>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC05>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC06>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC07>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC08>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC09>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC10>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC11>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC12>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC13>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC14>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC15>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC16>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC17>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC18>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC19>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC20>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC21>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC22>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EC23>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EQ0>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EQ1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EQ2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EQ3>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EQ4>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_EQ5>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_FSI>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_MC01>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_MC23>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_N0>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_N1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_N2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_N3>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_OB0>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_OB1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_OB2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_OB3>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_PCI0>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_PCI1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_PCI2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_PRV>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint16_t, fapi2::ATTR_PG_XB>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint16_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint32_t, fapi2::ATTR_PLL_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, const fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint32_t, fapi2::ATTR_REPR_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, const fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int32_t, fapi2::ATTR_SCRATCH_INT32_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, int32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int32_t, fapi2::ATTR_SCRATCH_INT32_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const int32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int32_t, fapi2::ATTR_SCRATCH_INT32_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, int32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int32_t, fapi2::ATTR_SCRATCH_INT32_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const int32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int64_t, fapi2::ATTR_SCRATCH_INT64_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, int64_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int64_t, fapi2::ATTR_SCRATCH_INT64_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, int64_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int8_t, fapi2::ATTR_SCRATCH_INT8_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, int8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, int8_t, fapi2::ATTR_SCRATCH_INT8_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, int8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_ARRAY>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_ARRAY>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_PERV_ARRAY>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, const fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint32_t, fapi2::ATTR_SCRATCH_UINT32_PERV_ARRAY>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid,  const uint32_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint64_t, fapi2::ATTR_SCRATCH_UINT64_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint64_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint64_t, fapi2::ATTR_SCRATCH_UINT64_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const uint64_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint64_t, fapi2::ATTR_SCRATCH_UINT64_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint64_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_SCRATCH_UINT8_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_SCRATCH_UINT8_1>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const uint8_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_SCRATCH_UINT8_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, const fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __set<fapi2::TARGET_TYPE_PROC_CHIP, fapi2attr::ProcChipAttributes_t, uint8_t, fapi2::ATTR_SCRATCH_UINT8_2>   ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_ptarget, fapi2attr::ProcChipAttributes_t* object, const fapi2::AttributeId attrid,  const uint8_t& i_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_SYSTEM, fapi2attr::SystemAttributes_t, uint8_t, fapi2::ATTR_SYSTEM_IPL_PHASE>   ( const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& i_ptarget, const fapi2attr::SystemAttributes_t* object, const fapi2::AttributeId attrid, uint8_t* o_pvalue );
-template<> void __get<fapi2::TARGET_TYPE_PERV, fapi2attr::PervAttributes_t, uint32_t, fapi2::ATTR_TIME_RING>   ( const fapi2::Target<fapi2::TARGET_TYPE_PERV>& i_ptarget, const fapi2attr::PervAttributes_t* object, const fapi2::AttributeId attrid, uint32_t* o_pvalue );
-
-
-
-//******************************************************************************
-// Get base template
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                T& o_value)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get uint8_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                uint8_t& o_value)
-{
-    static_assert(std::is_same<T, uint8_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get uint16_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                uint16_t& o_value)
-{
-    static_assert(std::is_same<T, uint16_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get uint32_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                uint32_t& o_value)
-{
-    static_assert(std::is_same<T, uint32_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get uint64_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                uint64_t& o_value)
-{
-    static_assert(std::is_same<T, uint64_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get Override uint8_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        uint8_t& o_value)
-{
-    static_assert(std::is_same<T, uint8_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get Override uint16_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        uint16_t& o_value)
-{
-    static_assert(std::is_same<T, uint16_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get Override uint32_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        uint32_t& o_value)
-{
-    static_assert(std::is_same<T, uint32_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get Override uint64_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        uint64_t& o_value)
-{
-    static_assert(std::is_same<T, uint64_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get override EC Feature (uint8_t)
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getEcFeatureOverride(const AttributeId i_id,
-                                 const Target<K> & i_pTarget,
-                                 uint8_t& o_value)
-{
-    static_assert(std::is_same<T, uint8_t>::value, "Attribute type mismatch");
-
-    // The way this is implemented, we want to return a non-zero return code if we found an override.
-    // Return 0 if there was an error.
-    // This is how it's implemented:
-    // PLAT_GET_CHIP_EC_FEATURE_OVERRIDE(ID, PTARGET, VAL) ? fapi::FAPI_RC_SUCCESS : fapi::fapiQueryChipEcFeature(fapi::ID, PTARGET, VAL)
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get uint8_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeArrayShort(const AttributeId i_id,
-                                   const Target<K> & i_pTarget,
-                                   uint8_t * o_pValues)
-{
-//       fapi2::Attributeta o_data;
-//     fapi2::ReturnCode l_fapi_rc(FAPI2_RC_SUCCESS);
-//     uint32_t l_ecmd_rc = ECMD_SUCCESS;
-//
-//     ecmdChipTarget l_ecmd_target;
-//     fapiTargetPointerToEcmdTarget(i_pTarget, l_ecmd_target);
-//
-//     o_data.faValidMask = FAPI_ATTRIBUTE_TYPE_UINT8ARY;
-//     o_data.faUint8ary = o_pValues;
-//
-//     l_ecmd_rc = fapi2GetAttribute(l_ecmd_target, i_id, o_data);
-//     if (l_ecmd_rc)
-//     {
-//         l_fapi_rc = (ReturnCodes) l_ecmd_rc;
-//     }
-//     return l_fapi_rc;
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set uint8_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _setAttributeArrayShort(const AttributeId i_id,
-                                   const Target<K> & i_pTarget,
-                                   uint8_t * i_pValues)
-{
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, *i_pValues );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, *i_pValues );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, *i_pValues );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, *i_pValues );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, *i_pValues );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, *i_pValues );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get uint16_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeArrayWord(const AttributeId i_id,
-                                  const Target<K> & i_pTarget,
-                                  uint16_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set uint16_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _setAttributeArrayWord(const AttributeId i_id,
-                                  const Target<K> & i_pTarget,
-                                  uint16_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get uint32_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeArrayWord(const AttributeId i_id,
-                                  const Target<K> & i_pTarget,
-                                  uint32_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set uint32_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _setAttributeArrayWord(const AttributeId i_id,
-                                  const Target<K> & i_pTarget,
-                                  uint32_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get uint64_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeArrayDoubleWord(const AttributeId i_id,
-                                        const Target<K> & i_pTarget,
-                                        uint64_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set uint64_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _setAttributeArrayDoubleWord(const AttributeId i_id,
-                                        const Target<K> & i_pTarget,
-                                        uint64_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override uint8_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeOverrideArrayShort(const AttributeId i_id,
-                                           const Target<K> & i_pTarget,
-                                           uint8_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override uint16_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeOverrideArrayWord(const AttributeId i_id,
-                                          const Target<K> & i_pTarget,
-                                          uint16_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override uint32_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeOverrideArrayWord(const AttributeId i_id,
-                                          const Target<K> & i_pTarget,
-                                          uint32_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override uint64_t array
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getAttributeOverrideArrayDoubleWord(const AttributeId i_id,
-                                                const Target<K> & i_pTarget,
-                                                uint64_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set base template
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const T& i_value)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-
-//******************************************************************************
-// Set uint8_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const uint8_t& i_value)
-{
-    static_assert(std::is_same<T, uint8_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set uint16_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const uint16_t& i_value)
-{
-    static_assert(std::is_same<T, uint16_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set uint32_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const uint32_t& i_value)
-{
-    static_assert(std::is_same<T, uint32_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id,i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set uint64_t
-//******************************************************************************
-
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const uint64_t & i_value)
-{
-    static_assert(std::is_same<T, uint64_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get int8_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                int8_t& o_value)
-{
-    static_assert(std::is_same<T, int8_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get int16_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                int16_t& o_value)
-{
-    static_assert(std::is_same<T, int16_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get int32_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                int32_t& o_value)
-{
-    static_assert(std::is_same<T, int32_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __get<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get int64_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _get(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                int64_t& o_value)
-{
-    static_assert(std::is_same<T, int64_t>::value, "Attribute type mismatch");
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __get<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-         __get<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __get<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __get<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, &o_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __get<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, &o_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get Override int8_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        int8_t& o_value)
-{
-    static_assert(std::is_same<T, int8_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override int16_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        int16_t& o_value)
-{
-    static_assert(std::is_same<T, int16_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override int32_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        int32_t& o_value)
-{
-    static_assert(std::is_same<T, int32_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override int64_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _getOverride(const AttributeId i_id,
-                        const Target<K> & i_pTarget,
-                        int64_t& o_value)
-{
-    static_assert(std::is_same<T, int64_t>::value, "Attribute type mismatch");
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get int8_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeArraySignedShort(const AttributeId i_id,
-                                         const Target<K> & i_pTarget,
-                                         int8_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set int8_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _setAttributeArraySignedShort(const AttributeId i_id,
-                                         const Target<K> & i_pTarget,
-                                         int8_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get int16_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeArraySignedWord(const AttributeId i_id,
-                                        const Target<K> & i_pTarget,
-                                        int16_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set int16_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _setAttributeArraySignedWord(const AttributeId i_id,
-                                        const Target<K> & i_pTarget,
-                                        int16_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get int32_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeArraySignedWord(const AttributeId i_id,
-                                        const Target<K> & i_pTarget,
-                                        int32_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set int32_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _setAttributeArraySignedWord(const AttributeId i_id,
-                                        const Target<K> & i_pTarget,
-                                        int32_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get int64_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeArraySignedDoubleWord(const AttributeId i_id,
-                                              const Target<K> & i_pTarget,
-                                              int64_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set int64_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _setAttributeArraySignedDoubleWord(const AttributeId i_id,
-                                              const Target<K> & i_pTarget,
-                                              int64_t * i_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override int8_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeOverrideArraySignedShort(const AttributeId i_id,
-                                                 const Target<K> & i_pTarget,
-                                                 int8_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override int16_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeOverrideArraySignedWord(const AttributeId i_id,
-                                                const Target<K> & i_pTarget,
-                                                int16_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Get Override int32_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeOverrideArraySignedWord(const AttributeId i_id,
-                                                const Target<K> & i_pTarget,
-                                                int32_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Get Override int64_t array
-//******************************************************************************
-template<TargetType K>
-ReturnCode _getAttributeOverrideArraySignedDoubleWord(const AttributeId i_id,
-                                                      const Target<K> & i_pTarget,
-                                                      int64_t * o_pValues)
-{
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set int8_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const int8_t& i_value)
-{
-    static_assert(std::is_same<T, int8_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set int16_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const int16_t& i_value)
-{
-    static_assert(std::is_same<T, int16_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-//******************************************************************************
-// Set int32_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const int32_t& i_value)
-{
-    static_assert(std::is_same<T, int32_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-//******************************************************************************
-// Set int64_t
-//******************************************************************************
-template<typename T, TargetType K, AttributeId A>
-ReturnCode _set(const AttributeId i_id,
-                const Target<K> & i_pTarget,
-                const int64_t & i_value)
-{
-    static_assert(std::is_same<T, int64_t>::value, "Attribute type mismatch"); // May need to remove
-
-    if(K & TARGET_TYPE_SYSTEM)
-    {
-        __set<K, fapi2attr::SystemAttributes_t, T, A>( i_pTarget, G_system_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PROC_CHIP)
-    {
-        __set<K, fapi2attr::ProcChipAttributes_t, T, A>( i_pTarget, G_proc_chip_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_PERV)
-    {
-        __set<K, fapi2attr::PervAttributes_t, T, A>( i_pTarget, G_perv_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_CORE)
-    {
-        __set<K, fapi2attr::CoreAttributes_t, T, A>( i_pTarget, G_core_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EQ)
-    {
-        __set<K, fapi2attr::EQAttributes_t, T, A>( i_pTarget, G_eq_attributes_ptr, i_id, i_value );
-    }
-
-    if(K & TARGET_TYPE_EX)
-    {
-        __set<K, fapi2attr::EXAttributes_t, T, A>( i_pTarget, G_ex_attributes_ptr, i_id, i_value );
-    }
-
-    return FAPI2_RC_SUCCESS;
-}
-
-
-} // namespace fapi2
-#endif // FAPIPLATATTRIBUTESERVICE_H_