diff options
| author | Mark Wenning <wenning@us.ibm.com> | 2012-04-06 10:43:34 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-04-06 11:09:27 -0500 |
| commit | 3de79fd2abfe0ef165a55ec06cc917a631be5705 (patch) | |
| tree | eb2f60829e928b51326915bd5b1b1dcd4f85c2e5 | |
| parent | 3b9b970812926d1cbc063174dd7f097b4fcb3793 (diff) | |
| download | talos-hostboot-3de79fd2abfe0ef165a55ec06cc917a631be5705.tar.gz talos-hostboot-3de79fd2abfe0ef165a55ec06cc917a631be5705.zip | |
Patch for HWAS to work with hb-istep
HWAS stubs (istep 6) are numbered 3, 5, and 6 but are in the table as 0,1,2 .
When hb-istep calls istep 6.3 it will get a "not found" error.
Short term solution for this sprint is to renumber the stubs to 0,1,2 .
This will be fixed permanently in another patch
Add IStep Stubs for all ISteps in IPL Flow Document (task 39253)
Change-Id: I7647c4405e1a19a83fe35af5ca6152b6585123d4
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/834
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rwxr-xr-x | src/build/simics/hb-simdebug.py | 7 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep06list.H | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/build/simics/hb-simdebug.py b/src/build/simics/hb-simdebug.py index 9971283a4..9daabaf5c 100755 --- a/src/build/simics/hb-simdebug.py +++ b/src/build/simics/hb-simdebug.py @@ -461,12 +461,7 @@ def istepHB( symsFile, str_arg1 ): ## start with empty inList. Put some dummy isteps in istep4 for debug. n = 25 ## size of inlist array inList = [[None]*n for x in xrange(n)] ## init to nothing - inList[4][0] = "i1" - inList[4][1] = "i2" - inList[4][2] = "i3" - inList[4][3] = "i4" - - + ## bump seqnum bump_g_SeqNum() diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H index 72a394ea4..cdcb8b8dc 100644 --- a/src/include/usr/isteps/istep06list.H +++ b/src/include/usr/isteps/istep06list.H @@ -58,8 +58,10 @@ namespace INITSERVICE */ const TaskInfo g_istep06[] = { + // @ todo isteps are numbered wrong to match up with hb-istep - + // need to add stubs for the other substeps { - ISTEPNAME(6,3,"host_init_fsi"), // substep name + ISTEPNAME(06,00,"host_init_fsi"), // substep name HWAS::host_init_fsi, // pointer to fn { START_FN, // task type @@ -67,7 +69,7 @@ const TaskInfo g_istep06[] = { } }, { - ISTEPNAME(6,5,"host_discover_targets"), // substep name + ISTEPNAME(06,01,"host_discover_targets"), // substep name HWAS::host_discover_targets, // pointer to fn { START_FN, // task type @@ -75,7 +77,7 @@ const TaskInfo g_istep06[] = { } }, { - ISTEPNAME(6, 6, "host_gard"), // substep name + ISTEPNAME(06,02, "host_gard"), // substep name HWAS::host_gard, // pointer to fn { START_FN, // task type |
