diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2012-02-08 08:31:23 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-02-08 11:22:29 -0600 |
| commit | 5b9f174f56e2dbb77178b767f7cb92668ec78e43 (patch) | |
| tree | c2fc717a3be6ccb13a3d6c371a6b3d2561442e66 /src | |
| parent | fbfb1f40a8c29d879c0f99a1d99ec2eb7186edca (diff) | |
| download | talos-hostboot-5b9f174f56e2dbb77178b767f7cb92668ec78e43.tar.gz talos-hostboot-5b9f174f56e2dbb77178b767f7cb92668ec78e43.zip | |
Fix extended image boot order.
Change-Id: I0213266209bbe8eb83babefc334818bd3c73f648
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/650
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/initservice/extinitsvc/extinitsvctasks.H | 142 |
1 files changed, 73 insertions, 69 deletions
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H index ca783b488..5d4e0db3c 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -43,72 +43,88 @@ const TaskInfo g_exttaskinfolist[] = { // ----- Extended Image ------------------------------------------ /** - * @brief ecmddatabuffer task, + * @brief targeting task, */ { - "libecmddatabuffer.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - START_ECMDDATABUFFER_ERRL_ID, // module id - } + "libtargeting.so" , // taskname + NULL, // no pointer to fn + { + START_TASK, // task type + EXT_IMAGE, // Extended Module + START_TARGETING_ERRL_ID, // module id + } }, /** - * @brief spd task + * @brief External interrupt resource provider */ { - "libspd.so", // taskname - NULL, // no pointer to fn + "libintr.so", // taskname + NULL, // no ptr to fnct { - INIT_TASK, // task type - EXT_IMAGE, // Extended module - START_SPD_ERRL_ID // module id + START_TASK, // task type + EXT_IMAGE, // Extended Module + START_INTR_ERRL_ID, // module id } }, /** - * @brief fapi task, + * @brief FSI Device Driver */ + { - "libfapi.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - START_FAPI_ERRL_ID, // module id - } + "libfsi.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + START_FSIDD_ERRL_ID, // module id + } }, /** - * @brief hwp task, + * @brief FSI SCOM Device Driver */ { - "libhwp.so" , // taskname + "libfsiscom.so" , // taskname NULL, // no pointer to fn { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_HWP_ERRL_ID, // module id + START_FSISCOM_ERRL_ID, // module id } }, /** - * @brief plat task, + * @brief I2C Device Driver */ { - "libplat.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - START_PLAT_ERRL_ID, // module id - } + "libi2c.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + START_I2C_ERRL_ID, // module id + } + }, + + /** + * @brief spd task + */ + { + "libspd.so", // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended module + START_SPD_ERRL_ID // module id + } }, // TODO: Added this in order to successfull init.. Need to remove this and put // the module load and unload from a the istep dispatcher +// PW - Is this really TODO? Don't we need the hwas module from errl to do +// gard / deconfig? /** * @brief HWAS, */ @@ -126,71 +142,58 @@ const TaskInfo g_exttaskinfolist[] = { // end TODO /** - * @brief FSI Device Driver + * @brief ecmddatabuffer task, */ - { - "libfsi.so" , // taskname + "libecmddatabuffer.so" , // taskname NULL, // no pointer to fn { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_FSIDD_ERRL_ID, // module id + START_ECMDDATABUFFER_ERRL_ID, // module id } }, /** - * @brief FSI SCOM Device Driver + * @brief fapi task, */ { - "libfsiscom.so" , // taskname + "libfapi.so" , // taskname NULL, // no pointer to fn { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_FSISCOM_ERRL_ID, // module id + START_FAPI_ERRL_ID, // module id } }, /** - * @brief I2C Device Driver - */ - { - "libi2c.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - START_I2C_ERRL_ID, // module id - } - }, - - /** - * @brief targeting task, + * @brief hwp task, */ { - "libtargeting.so" , // taskname - NULL, // no pointer to fn - { - START_TASK, // task type - EXT_IMAGE, // Extended Module - START_TARGETING_ERRL_ID, // module id - } + "libhwp.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + START_HWP_ERRL_ID, // module id + } }, /** - * @brief External interrupt resource provider + * @brief plat task, */ { - "libintr.so", // taskname - NULL, // no ptr to fnct - { - START_TASK, // task type - EXT_IMAGE, // Extended Module - START_INTR_ERRL_ID, // module id - } + "libplat.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + START_PLAT_ERRL_ID, // module id + } }, +// TODO: Should these be automatically loaded / unloaded by istepdispatcher? /** * @brief VSBE FAPI interface code library. */ @@ -216,6 +219,7 @@ const TaskInfo g_exttaskinfolist[] = { START_POREVE_ERRL_ID // module id } }, +// end TODO. // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // NOTE: libistepdisp.so needs to always be last in this list!! |
