diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2017-08-03 11:16:41 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-08-03 17:48:55 -0400 |
| commit | 0a92b575a0a9c11f495ac27987923d984c5fc70c (patch) | |
| tree | 59f64976f945637fd9f0bcc471a8d18b896f8c59 /src/include | |
| parent | bbb94013c39af35e86427553219f9ec3278ca97f (diff) | |
| download | talos-hostboot-0a92b575a0a9c11f495ac27987923d984c5fc70c.tar.gz talos-hostboot-0a92b575a0a9c11f495ac27987923d984c5fc70c.zip | |
Resolve istep mode issue with istep 18 on FSP systems
Resolves the situation on FSP in istep mode where the high
watermark is unable to advance beyond step 18 due to an empty
non-null entry the steps array.
Change-Id: If1a20aac114625c4b166b92594ad4dd83af82e02
CQ:SW397912
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44163
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@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: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/isteps/istepmasterlist.H | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/include/usr/isteps/istepmasterlist.H b/src/include/usr/isteps/istepmasterlist.H index d77f39e47..25189cae2 100644 --- a/src/include/usr/isteps/istepmasterlist.H +++ b/src/include/usr/isteps/istepmasterlist.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -81,6 +81,8 @@ #include "istep20list.H" #include "istep21list.H" +#include "config.h" + namespace INITSERVICE { @@ -104,9 +106,17 @@ const ExtTaskInfo g_isteps[] = { INITSERVICE::g_istep15TaskList, // IStep 15 INITSERVICE::g_istep16TaskList, // IStep 16 { NULL, 0, NULL}, // FSP IStep 17 +#ifdef CONFIG_FSP_BUILD + { NULL, 0, NULL}, // FSP IStep 18 +#else INITSERVICE::g_istep18TaskList, // IStep 18 +#endif { NULL, 0, NULL }, // FSP IStep 19 +#ifdef CONFIG_FSP_BUILD + { NULL, 0, NULL}, // FSP IStep 20 +#else INITSERVICE::g_istep20TaskList, // IStep 20 +#endif INITSERVICE::g_istep21TaskList // IStep 21 // // add further istep lists at the end. |
