From a59dccb2db8eabad2b756b9207e28a0e72aa7cbc Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Thu, 13 Nov 2014 12:47:31 -0600 Subject: P8+ VPO - HB supports to istep 7 for NVLINK test Change-Id: I79ec79e1601ae51bf759b80a07c5b4cf2d97fc5c RTC: 95236 Depends-On: I19823ac32a963d7072d21140b828c30ab326a19f Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14468 Tested-by: Jenkins Server Reviewed-by: Thi N. Tran Reviewed-by: A. Patrick Williams III --- src/include/usr/isteps/istep09list.H | 10 +++++++++- src/include/usr/isteps/istep10list.H | 8 ++++++++ src/include/usr/isteps/istep11list.H | 11 ++++++++++- src/include/usr/isteps/istep12list.H | 6 ++++++ src/include/usr/isteps/istep13list.H | 7 +++++++ src/include/usr/isteps/istep14list.H | 7 +++++++ src/include/usr/isteps/istep15list.H | 8 ++++++++ src/include/usr/isteps/istep18list.H | 12 +++++++++++- src/include/usr/isteps/istep21list.H | 7 +++++++ 9 files changed, 73 insertions(+), 3 deletions(-) (limited to 'src/include/usr') diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H index d3c91e555..6ea16a920 100644 --- a/src/include/usr/isteps/istep09list.H +++ b/src/include/usr/isteps/istep09list.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -49,6 +51,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/activate_powerbus/activate_powerbus.H" +#include namespace INITSERVICE { @@ -58,6 +61,8 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, +// Reduce ext img for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(09,01,"proc_build_smp"), ACTIVATE_POWERBUS::call_proc_build_smp, @@ -68,14 +73,17 @@ namespace INITSERVICE ACTIVATE_POWERBUS::call_host_slave_sbe_update, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep09Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libactivate_powerbus.so), DEP_LIB(libdram_initialization.so), DEP_LIB(libsbe.so), DEP_LIB(libbuild_winkle_images.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H index aa48cc11b..cd40eea4f 100644 --- a/src/include/usr/isteps/istep10list.H +++ b/src/include/usr/isteps/istep10list.H @@ -71,6 +71,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H" +#include namespace INITSERVICE { @@ -81,6 +82,9 @@ const TaskInfo g_istep10[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce extended img size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(10,01,"host_prd_hwreconfig"), HWAS::host_prd_hwreconfig, @@ -151,10 +155,13 @@ const TaskInfo g_istep10[] = { HWAS::host_stub, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif + }; const DepModInfo g_istep10Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libsbe_centaur_init.so), DEP_LIB(libfapiporeve.so), DEP_LIB(libporeve.so), @@ -162,6 +169,7 @@ const DepModInfo g_istep10Dependancies = { DEP_LIB(libsbe.so), DEP_LIB(libproc_hwreconfig.so), DEP_LIB(libslave_sbe.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index 85a901b64..7006c83c2 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -69,6 +71,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/dmi_training/dmi_training.H" +#include namespace INITSERVICE { @@ -79,6 +82,9 @@ const TaskInfo g_istep11[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(11,01,"mss_getecid"), DMI_TRAINING::call_mss_getecid, @@ -144,13 +150,16 @@ const TaskInfo g_istep11[] = { DMI_TRAINING::call_cen_set_inband_addr, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep11Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libdmi_training.so), DEP_LIB(libedi_ei_initialization.so), DEP_LIB(libnest_chiplets.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index 824016ac8..2e724f25c 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -69,6 +69,8 @@ const TaskInfo g_istep12[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, +// To reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(12,01,"host_collect_dimm_spd"), MC_CONFIG::call_host_collect_dimm_spd, @@ -94,11 +96,15 @@ const TaskInfo g_istep12[] = { MC_CONFIG::call_mss_attr_update, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep12Dependancies = { { +// To reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libmc_config.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H index 842ac6c5e..e717a4a66 100644 --- a/src/include/usr/isteps/istep13list.H +++ b/src/include/usr/isteps/istep13list.H @@ -71,6 +71,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/dram_training/dram_training.H" +#include namespace INITSERVICE { @@ -80,6 +81,9 @@ const TaskInfo g_istep13[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(13,01,"host_disable_vddr"), DRAM_TRAINING::call_host_disable_vddr, @@ -140,12 +144,15 @@ const TaskInfo g_istep13[] = { DRAM_TRAINING::call_mss_dimm_power_test, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep13Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libdram_training.so), DEP_LIB(libdram_initialization.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H index 73c612c38..d4ebcd88f 100644 --- a/src/include/usr/isteps/istep14list.H +++ b/src/include/usr/isteps/istep14list.H @@ -58,6 +58,7 @@ #include #include +#include // include prototypes file #include "../../../usr/hwpf/hwp/dram_initialization/dram_initialization.H" @@ -70,6 +71,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce ext img for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(14,01,"host_startprd_dram"), DRAM_INITIALIZATION::call_host_startprd_dram, @@ -115,14 +119,17 @@ namespace INITSERVICE DRAM_INITIALIZATION::call_host_mpipl_service, { START_FN, EXT_IMAGE, MPIPL_OP, true } }, +#endif }; const DepModInfo g_istep14Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libdram_initialization.so), DEP_LIB(libdram_training.so), DEP_LIB(libdump.so), DEP_LIB(libnest_chiplets.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H index d7774cad3..9c0bc2e86 100644 --- a/src/include/usr/isteps/istep15list.H +++ b/src/include/usr/isteps/istep15list.H @@ -49,6 +49,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/build_winkle_images/build_winkle_images.H" +#include namespace INITSERVICE { @@ -58,6 +59,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// To reduce extended image size for VPO, don't run these isteps in VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(15,01,"host_build_winkle"), BUILD_WINKLE_IMAGES::call_host_build_winkle, @@ -73,13 +77,17 @@ namespace INITSERVICE BUILD_WINKLE_IMAGES::call_p8_poreslw_init, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true } }, +#endif + }; const DepModInfo g_istep15Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libocc.so), DEP_LIB(libbuild_winkle_images.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H index 3a4129ec0..3ce23445b 100644 --- a/src/include/usr/isteps/istep18list.H +++ b/src/include/usr/isteps/istep18list.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -45,6 +47,7 @@ #include #include +#include // include prototypes file #include "../../../usr/hwpf/hwp/tod_init/tod_init.H" @@ -118,6 +121,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// To reduce extended image size for VPO, don't run these isteps in VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(18,13,"proc_tod_setup"), TOD::call_tod_setup, @@ -128,11 +134,15 @@ namespace INITSERVICE TOD::call_tod_init, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false } }, +#endif + }; const DepModInfo g_istep18Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libtod_init.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H index 52a8311dd..0d024d021 100644 --- a/src/include/usr/isteps/istep21list.H +++ b/src/include/usr/isteps/istep21list.H @@ -64,6 +64,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// To reduce extended image size for VPO, don't run these isteps in VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(21,01,"host_runtime_setup"), START_PAYLOAD::call_host_runtime_setup, @@ -79,10 +82,13 @@ namespace INITSERVICE START_PAYLOAD::call_host_start_payload, { START_FN, EXT_IMAGE, MPIPL_OP | NORMAL_IPL_OP, false } }, +#endif + }; const DepModInfo g_istep21Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libbuild_winkle_images.so), DEP_LIB(libstart_payload.so), DEP_LIB(libruntime.so), @@ -94,6 +100,7 @@ const DepModInfo g_istep21Dependancies = { #if defined(CONFIG_HTMGT) DEP_LIB(libhtmgt.so), DEP_LIB(libmc_config.so), +#endif #endif NULL } -- cgit v1.2.1