From 02ce8a1a51a9c73fdae84c60021e72703602e872 Mon Sep 17 00:00:00 2001 From: Martin Peschke Date: Wed, 30 Mar 2016 14:10:57 +0200 Subject: P9-XIP: improved image reports - enlarged build host string to avoid truncation - provide both section start and end offset in section table - provide section aligment in section table - fix "(null)" section name - aligning some fields Magic Number : 0x5849502053475045 "XIP SGPE" Header Version : 0x09 Link Address : 0x0000000080000000 L1 Loader Address : 0x00000000 L2 Loader Address : 0x00000000 Kernel Address : 0x00000000 Image Size : 0x000074f0 (29936) Normalized : Yes TOC Sorted : Yes Build Time : 14:22 Build User : mpeschke Build Host : hdrhapcc.boeblingen.de.ibm.com Section Table : Name Alignment Start End Size .header 1 0x00000000 0x0000015b 0x0000015c (348) .fixed 1 0x00000000 0x00000000 (0) .fixedtoc 1 0x00000000 0x00000000 (0) .toc 4 0x0000015c 0x000001f7 0x0000009c (156) .strings 1 0x000001f8 0x00000291 0x0000009a (154) .qpmr 8 0x00000298 0x00000697 0x00000400 (1024) .lvl1_bl 8 0x00000698 0x00000a97 0x00000400 (1024) .lvl2_bl 8 0x00000a98 0x00000e97 0x00000400 (1024) .hcode 8 0x00000e98 0x000074ef 0x00006658 (26200) 1 0x00000000 0x00000000 (0) 1 0x00000000 0x00000000 (0) 1 0x00000000 0x00000000 (0) 1 0x00000000 0x00000000 (0) 1 0x00000000 0x00000000 (0) 1 0x00000000 0x00000000 (0) Change-Id: I729a482504d5b3d310f93b982ad782fd4d254073 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22659 Tested-by: Jenkins Server Tested-by: Hostboot CI Tested-by: PPE CI Reviewed-by: Claus M. Olsen Reviewed-by: Prachi Gupta Reviewed-by: Martin Peschke Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22662 Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/import/chips/p9/xip/p9_xip_image.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/import/chips/p9/xip/p9_xip_image.h b/src/import/chips/p9/xip/p9_xip_image.h index cc06ffd05..6c9ff69db 100644 --- a/src/import/chips/p9/xip/p9_xip_image.h +++ b/src/import/chips/p9/xip/p9_xip_image.h @@ -108,8 +108,8 @@ typedef enum { /// Applications can use this macro to safely index the array of section /// names. -#define P9_XIP_SECTION_NAME(var, n) \ - ((((n) < 0) || ((n) > (int)(sizeof(var) / sizeof(char*)))) ? \ +#define P9_XIP_SECTION_NAME(var, n) \ + ((((n) < 0) || ((n) >= (int)(sizeof(var) / sizeof(char*)))) ? \ "" : var[n]) #endif /* __ASSEMBLER__ */ @@ -408,10 +408,10 @@ typedef struct char iv_buildUser[16]; /// Build host, generated by `hostname` - char iv_buildHost[24]; + char iv_buildHost[40]; /// Reserved for future expansion - char iv_reservedChar[24]; + char iv_reservedChar[8]; } P9XipHeader; -- cgit v1.2.1