From 8c6fb88e5ad1f09dc548baa452e0068a4a779f77 Mon Sep 17 00:00:00 2001 From: Raja Das Date: Tue, 21 Mar 2017 03:45:52 -0500 Subject: Increased the size of buildTag in xip header by another 4Bytes RTC:170829 Change-Id: I82b6a6fbe0816ab3cf205aa4e7b5dfe1fda2c8bb Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38195 Tested-by: Jenkins Server Reviewed-by: Shakeeb A. Pasha B K Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Sachin Gupta Reviewed-by: Martin Peschke Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38205 Reviewed-by: Hostboot Team Tested-by: FSP CI Jenkins --- src/build/utils/base_ppe_header.S | 4 +--- src/import/chips/p9/xip/p9_xip_image.c | 2 -- src/import/chips/p9/xip/p9_xip_image.h | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/build/utils/base_ppe_header.S b/src/build/utils/base_ppe_header.S index da9245ff..7e8cbc23 100644 --- a/src/build/utils/base_ppe_header.S +++ b/src/build/utils/base_ppe_header.S @@ -87,9 +87,7 @@ __build_date: __build_time: .long 0 __build_tag: - .asciz "unknown " # 16 Characters -__header_32_reserved: - .long 0 + .asciz "unknown " # 20 Characters .xip_toc image_size, P9_XIP_UINT32, __image_size .xip_toc build_date, P9_XIP_UINT32, __build_date diff --git a/src/import/chips/p9/xip/p9_xip_image.c b/src/import/chips/p9/xip/p9_xip_image.c index 548acc1a..c97a3d02 100644 --- a/src/import/chips/p9/xip/p9_xip_image.c +++ b/src/import/chips/p9/xip/p9_xip_image.c @@ -3084,8 +3084,6 @@ p9_xip_translate_header(P9XipHeader* o_dest, const P9XipHeader* i_src) memcpy(o_dest->iv_buildTag, i_src->iv_buildTag, sizeof(i_src->iv_buildTag)); - o_dest->iv_reserved32 = 0; - o_dest->iv_headerVersion = i_src->iv_headerVersion; o_dest->iv_normalized = i_src->iv_normalized; o_dest->iv_tocSorted = i_src->iv_tocSorted; diff --git a/src/import/chips/p9/xip/p9_xip_image.h b/src/import/chips/p9/xip/p9_xip_image.h index b096c68f..3961478d 100644 --- a/src/import/chips/p9/xip/p9_xip_image.h +++ b/src/import/chips/p9/xip/p9_xip_image.h @@ -396,10 +396,7 @@ typedef struct uint32_t iv_buildTime; /// Build tag, generated when releasing this image to fw - char iv_buildTag[16]; - - /// Reserved for future expansion - uint32_t iv_reserved32; + char iv_buildTag[20]; ////////////////////////////////////////////////////////////////////// // Other Information - 1-byte aligned; 8 entries -- cgit v1.2.1