diff options
Diffstat (limited to 'src/import/hwpf')
3 files changed, 28 insertions, 9 deletions
diff --git a/src/import/hwpf/fapi2/include/target_types.H b/src/import/hwpf/fapi2/include/target_types.H index fe8c888f..e5807063 100644 --- a/src/import/hwpf/fapi2/include/target_types.H +++ b/src/import/hwpf/fapi2/include/target_types.H @@ -76,12 +76,16 @@ enum TargetType TARGET_TYPE_PHB = 0x00800000, ///< PHB type TARGET_TYPE_MC = 0x01000000, ///< MC type TARGET_TYPE_OMI = 0x02000000, ///< OMI type + TARGET_TYPE_OMIC = 0x04000000, ///< OMIC type + TARGET_TYPE_MCC = 0x08000000, ///< MCC type + TARGET_TYPE_OCMB_CHIP = 0x10000000, ///< OCMB type TARGET_TYPE_ALL = 0xFFFFFFFF, ///< Any/All types // Compound target types TARGET_TYPE_CHIPS = TARGET_TYPE_PROC_CHIP | - TARGET_TYPE_MEMBUF_CHIP, + TARGET_TYPE_MEMBUF_CHIP | + TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_CHIPLETS = TARGET_TYPE_EX | TARGET_TYPE_MBA | @@ -103,7 +107,9 @@ enum TargetType TARGET_TYPE_PEC | TARGET_TYPE_PHB | TARGET_TYPE_MC | - TARGET_TYPE_OMI, + TARGET_TYPE_OMI | + TARGET_TYPE_OMIC | + TARGET_TYPE_MCC, // Mappings to target types found in the error xml files TARGET_TYPE_EX_CHIPLET = TARGET_TYPE_EX, diff --git a/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml index 41d9767e..a975e844 100644 --- a/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml +++ b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2015,2017 --> +<!-- Contributors Listed Below - COPYRIGHT 2015,2018 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -26,7 +26,11 @@ <!-- ******************************************************************************** --> <attribute> <id>ATTR_NAME</id> - <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP</targetType> + <targetType> + TARGET_TYPE_PROC_CHIP, + TARGET_TYPE_MEMBUF_CHIP, + TARGET_TYPE_OCMB_CHIP + </targetType> <description> Product name of a chip target. Provided by the MRW. @@ -37,7 +41,8 @@ CENTAUR = 0x3, NIMBUS = 0x5, CUMULUS = 0x6, - AXONE = 0x7 + AXONE = 0x7, + EXPLORER = 0x8 </enum> <platInit/> <privileged/> @@ -45,7 +50,11 @@ <!-- ********************************************************************* --> <attribute> <id>ATTR_EC</id> - <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP</targetType> + <targetType> + TARGET_TYPE_PROC_CHIP, + TARGET_TYPE_MEMBUF_CHIP, + TARGET_TYPE_OCMB_CHIP + </targetType> <description> EC level of a chip target. Read from the chip by the platform @@ -59,7 +68,11 @@ <!-- ********************************************************************* --> <attribute> <id>ATTR_MINI_EC</id> - <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP</targetType> + <targetType> + TARGET_TYPE_PROC_CHIP, + TARGET_TYPE_MEMBUF_CHIP, + TARGET_TYPE_OCMB_CHIP + </targetType> <description> Specifies extra mini-EC versions beyond the standard Major.Minor DD level, e.g. 1.02 would have ATTR_EC=0x10, ATTR_MINI_EC=2 diff --git a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml index ded7a21d..2c4ea7a2 100644 --- a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml +++ b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2015,2017 --> +<!-- Contributors Listed Below - COPYRIGHT 2015,2018 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -29,7 +29,7 @@ <targetType> TARGET_TYPE_CORE, TARGET_TYPE_EX, TARGET_TYPE_EQ, TARGET_TYPE_MCS, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI, TARGET_TYPE_DMI, - TARGET_TYPE_MC, TARGET_TYPE_OMI, + TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC, TARGET_TYPE_MCC, TARGET_TYPE_XBUS, TARGET_TYPE_OBUS, TARGET_TYPE_OBUS_BRICK, TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, |
