diff options
| author | Thi Tran <thi@us.ibm.com> | 2017-09-11 09:24:54 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-09-14 22:39:09 -0400 |
| commit | 53135e0ca453b7e9a4c14b11a6c1771ce25e172d (patch) | |
| tree | 2c13115e090cae7b3a2cd8af886743b94db30aba /src/import/chips/p9 | |
| parent | 699ec6071a26fe6fc6694a1122e6bd5e38d87d23 (diff) | |
| download | talos-hostboot-53135e0ca453b7e9a4c14b11a6c1771ce25e172d.tar.gz talos-hostboot-53135e0ca453b7e9a4c14b11a6c1771ce25e172d.zip | |
Undo HB p9_chiplet_scominit workaround
Change-Id: Ib92718e7d31875c6e30c2cc6aede30d7c9569b7e
RTC: 176054
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46010
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46016
Reviewed-by: Hostboot Team <hostboot@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>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C index 731d57641..caaef4f1f 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C @@ -32,7 +32,7 @@ // *HWP HW Owner : Joe McGill <jmcgill@us.ibm.com> // *HWP FW Owner : Thi N. Tran <thi@us.ibm.com> // *HWP Team : Nest -// *HWP Level : 2 +// *HWP Level : 3 // *HWP Consumed by : HB // @@ -43,19 +43,13 @@ #include <p9_fbc_ioo_tl_scom.H> #include <p9_fbc_ioo_dl_scom.H> #include <p9n_mcs_scom.H> - -//TODO: RTC 176054 -#ifndef __HOSTBOOT_MODULE - #include <p9c_dmi_scom.H> - #include <p9c_mi_scom.H> - #include <p9c_mc_scom.H> -#endif - +#include <p9c_dmi_scom.H> +#include <p9c_mi_scom.H> +#include <p9c_mc_scom.H> #include <p9_cxa_scom.H> #include <p9_nx_scom.H> #include <p9_int_scom.H> #include <p9_vas_scom.H> - #include <p9_xbus_scom_addresses.H> #include <p9_xbus_scom_addresses_fld.H> #include <p9_obus_scom_addresses.H> @@ -103,12 +97,7 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO std::vector<fapi2::Target<fapi2::TARGET_TYPE_OBUS>> l_obus_chiplets; std::vector<fapi2::Target<fapi2::TARGET_TYPE_MCS>> l_mcs_targets; std::vector<fapi2::Target<fapi2::TARGET_TYPE_MI>> l_mi_targets; - -//TODO: RTC 176054 -#ifndef __HOSTBOOT_MODULE std::vector<fapi2::Target<fapi2::TARGET_TYPE_MC>> l_mc_targets; -#endif - std::vector<fapi2::Target<fapi2::TARGET_TYPE_DMI>> l_dmi_targets; std::vector<fapi2::Target<fapi2::TARGET_TYPE_CAPP>> l_capp_targets; std::vector<fapi2::Target<fapi2::TARGET_TYPE_OBUS_BRICK>> l_obrick_targets; @@ -221,11 +210,7 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO l_mcs_targets = i_target.getChildren<fapi2::TARGET_TYPE_MCS>(); l_mi_targets = i_target.getChildren<fapi2::TARGET_TYPE_MI>(); l_dmi_targets = i_target.getChildren<fapi2::TARGET_TYPE_DMI>(); - -//TODO: RTC 176054 -#ifndef __HOSTBOOT_MODULE l_mc_targets = i_target.getChildren<fapi2::TARGET_TYPE_MC>(); -#endif if (l_mcs_targets.size()) { @@ -244,10 +229,6 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO } } } - -//TODO: RTC 176054 -#ifndef __HOSTBOOT_MODULE - else if (l_mc_targets.size()) { for (auto l_mc_target : l_mc_targets) @@ -292,10 +273,6 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO } } } - -//TODO: RTC 176054 -#endif // __HOSTBOOT_MODULE - else { FAPI_INF("No MCS/MI targets found! Do nothing!"); |
