summaryrefslogtreecommitdiffstats
path: root/src/import/hwpf
diff options
context:
space:
mode:
authorMatt K. Light <mklight@us.ibm.com>2018-04-27 07:59:56 -0500
committerSachin Gupta <sgupta2m@in.ibm.com>2018-06-26 22:33:34 -0400
commit784e309914973f8925ec3a992b594665d971ece2 (patch)
treef3cdf5ab3447da1728ae69c95bf0c9c289b699a1 /src/import/hwpf
parent67921d4743cf2e3401e80c4840f504d0778e2fbd (diff)
downloadtalos-sbe-784e309914973f8925ec3a992b594665d971ece2.tar.gz
talos-sbe-784e309914973f8925ec3a992b594665d971ece2.zip
Add more fapi2 target types for Axone
Change-Id: Ie825c3e9034f657aed821c43ebafb242bd125cd5 Signed-off-by: Matt K. Light <mklight@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57946 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57956 Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/import/hwpf')
-rw-r--r--src/import/hwpf/fapi2/include/target_types.H10
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml23
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml4
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,
OpenPOWER on IntegriCloud