summaryrefslogtreecommitdiffstats
path: root/src/import/chips/p9/xip
diff options
context:
space:
mode:
authorClaus Michael Olsen <cmolsen@us.ibm.com>2018-05-14 17:51:09 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-10-14 13:05:32 -0500
commit52b76be222254e59959db984606c09dae854270b (patch)
treea009b9fbeca0437d3552844bfd55f64147d4a0e1 /src/import/chips/p9/xip
parent62feee748b72ef5f7cb1032964dab2b0686cd916 (diff)
downloadtalos-hostboot-52b76be222254e59959db984606c09dae854270b.tar.gz
talos-hostboot-52b76be222254e59959db984606c09dae854270b.zip
P10 prep: Infrastructure (IS) ring Id metadata and API changes
Gerrit intent: - Applicable for P9 merge (co-req NOT required) - Co-req not req'd for any tests Includes the following changes: - Accommodates initCompiler's needs for additional ring Id APIs to retrieve IS's key ring identifiers, ringId and ringClass, and to align with our enumerated chipId - Elimination of redundancy in and reorg of IS's ring Id lists: RingProperties, GenRingIdList (gone) and ChipletData. - GenRingIdList has been removed. - Expand RingProperties to also include scanScomAddr and ringClass. - Member of ring and chiplet properties structs have been renamed in consistent camel style (no longer using "iv_" anywhere). - Note that with "infrastructure (IS)" we here mean the core infrastructure codes that directly interact with and affect the image. Key_Cronus_Test=XIP_REGRESS Change-Id: I7e92af04edd10c0994718e476f6e7b77c5d124d6 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/59087 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/xip')
-rw-r--r--src/import/chips/p9/xip/p9_xip_image.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/import/chips/p9/xip/p9_xip_image.h b/src/import/chips/p9/xip/p9_xip_image.h
index d5e8cc43c..42b35e0b1 100644
--- a/src/import/chips/p9/xip/p9_xip_image.h
+++ b/src/import/chips/p9/xip/p9_xip_image.h
@@ -708,7 +708,7 @@ int
p9_xip_get_section(const void* i_image,
const int i_sectionId,
P9XipSection* o_hostSection,
-#if defined(__PPE__)
+#ifdef __PPE__
uint8_t i_ddLevel);
#else
uint8_t i_ddLevel=UNDEFINED_DD_LEVEL);
@@ -1489,8 +1489,8 @@ p9_xip_decode_toc_dump(void* i_image, void* i_dump,
/// Attempt to grow the image past its defined memory allocation
#define P9_XIP_WOULD_OVERFLOW 14
-/// Error associated with the disassembler occured.
-#define P9_XIP_DISASSEMBLER_ERROR 15
+/// Error returned from an TOR API function.
+#define P9_XIP_TOR_API_ERROR 15
/// Hash collision creating the .fixed_toc section
#define P9_XIP_HASH_COLLISION 16
OpenPOWER on IntegriCloud