Skip to content

Commit

Permalink
Add c_str generic API and update makefiles
Browse files Browse the repository at this point in the history 
Change-Id: I95e3b9013d3ab0c352d3614c12ee4ef0d26965d0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35924
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35952
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@aamarin @dcrowell77
aamarin authored and dcrowell77 committed Feb 11, 2017
1 parent 20f6c12 commit 10c47be
Show file tree
Hide file tree
Showing 55 changed files with 113 additions and 81 deletions.
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -40,7 +40,7 @@

#include <p9_mc_scom_addresses.H>

#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/shared/mss_kind.H>

namespace mss
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load_ddr4.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -36,7 +36,7 @@
#include <fapi2.H>
#include <p9_mc_scom_addresses.H>

#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/conversions.H>
#include <lib/eff_config/timing.H>
#include <lib/ccs/ccs.H>
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -41,7 +41,7 @@

#include <p9_mc_scom_addresses.H>

#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/ccs/ccs.H>

namespace mss
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H
View file
Expand Up @@ -38,7 +38,7 @@

#include <vector>
#include <fapi2.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/shared/mss_const.H>
#include <lib/dimm/bcw_load_ddr4.H>
#include <lib/phy/dp16.H>
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -35,7 +35,7 @@

#include <vector>
#include <fapi2.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/dimm/ddr4/mrs_load_ddr4.H>
#include <lib/dimm/ddr4/latch_wr_vref.H>
#include <lib/dimm/rank.H>
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -38,7 +38,7 @@

#include <vector>
#include <fapi2.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/dimm/mrs_load.H>
#include <lib/dimm/ddr4/mrs_load_ddr4.H>
#include <lib/eff_config/timing.H>
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/mrs_load_ddr4.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -38,7 +38,7 @@

#include <vector>
#include <fapi2.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/dimm/mrs_load.H>
#include <lib/eff_config/timing.H>

Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.C
View file
Expand Up @@ -34,7 +34,7 @@
// *HWP Consumed by: HB:FSP

#include <fapi2.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/dimm/ddr4/state_machine.H>

namespace mss
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.H
View file
Expand Up @@ -37,7 +37,7 @@
#define _MSS_STATE_MACHINE_H_

#include <fapi2.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/checker.H>

namespace mss
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -39,7 +39,7 @@
#include <fapi2.H>

#include <lib/mss_attribute_accessors.H>
#include <lib/utils/c_str.H>
#include <c_str.H>

namespace mss
{
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H
View file
Expand Up @@ -39,7 +39,7 @@
#include <fapi2.H>
#include <p9_mc_scom_addresses.H>

#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/shared/mss_kind.H>
#include <lib/ccs/ccs.H>

Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -40,7 +40,7 @@

#include <p9_mc_scom_addresses.H>

#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/shared/mss_kind.H>

namespace mss
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -40,7 +40,7 @@

#include <p9_mc_scom_addresses.H>

#include <lib/utils/c_str.H>
#include <c_str.H>

namespace mss
{
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H
View file
Expand Up @@ -44,8 +44,8 @@

#include <lib/shared/mss_const.H>
#include <lib/utils/scom.H>
#include <lib/utils/c_str.H>
#include <lib/dimm/rank.H>
#include <c_str.H>

namespace mss
{
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -43,7 +43,7 @@

#include <lib/shared/mss_const.H>
#include <lib/utils/scom.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/dimm/kind.H>

namespace mss
Expand Down
3 changes: 2 additions & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/mss.mk
View file
Expand Up @@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2015,2016
# Contributors Listed Below - COPYRIGHT 2015,2017
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -40,6 +40,7 @@ MSS_SOURCE_DIRS := $(shell find $(MSS_PATH) -type d)
define MSS_MODULE_INCLUDES
$(foreach dir, $(MSS_SOURCE_DIRS), $(call ADD_MODULE_SRCDIR,$(1),$(dir)))
$(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)/chips/p9/procedures/hwp/memory)
$(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)/generic/memory)
$(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PATH)/include)
$(call ADD_MODULE_INCDIR,$(1),$(GENPATH))
$(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PATH)/include)
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -39,6 +39,6 @@
//TK: what is this for? BRS

#include <lib/utils/index.H>
#include <lib/utils/c_str.H>
#include <c_str.H>

#endif // _MSS_P9_ATTR_UTILS_H_
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -36,7 +36,7 @@
#include <fapi2.H>
#include <lib/phy/apb.H>
#include <lib/utils/scom.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/index.H>

namespace mss
Expand Down
3 changes: 2 additions & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
View file
Expand Up @@ -36,6 +36,7 @@
#include <fapi2.H>
#include <utility>
#include <vector>
#include <map>

#include <p9_mc_scom_addresses.H>
#include <p9_mc_scom_addresses_fld.H>
Expand All @@ -48,7 +49,7 @@
#include <lib/dimm/rank.H>
#include <lib/utils/scom.H>
#include <lib/utils/pos.H>
#include <lib/utils/c_str.H>
#include <c_str.H>

#include <lib/workarounds/dp16_workarounds.H>

Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -36,7 +36,7 @@
#include <fapi2.H>
#include <lib/phy/phy_cntrl.H>
#include <lib/utils/scom.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/index.H>

#include <lib/mss_attribute_accessors.H>
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -36,7 +36,7 @@
#include <fapi2.H>
#include <lib/phy/seq.H>
#include <lib/utils/scom.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/bit_count.H>
#include <lib/eff_config/timing.H>

Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -42,7 +42,7 @@
#include <lib/power_thermal/throttle.H>
#include <lib/power_thermal/decoder.H>
#include <lib/utils/find.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/count_dimm.H>
#include <lib/dimm/kind.H>

Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.C
View file
Expand Up @@ -44,7 +44,7 @@
#include <lib/spd/rdimm/rdimm_decoder.H>
#include <lib/spd/common/rcw_settings.H>
#include <lib/utils/checker.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/find.H>

using fapi2::TARGET_TYPE_MCA;
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.H
View file
Expand Up @@ -49,7 +49,7 @@
#include <lib/spd/common/rcw_settings.H>
#include <lib/spd/rdimm/rdimm_decoder.H>
#include <lib/spd/lrdimm/lrdimm_decoder.H>
#include <lib/utils/c_str.H>
#include <c_str.H>

namespace mss
{
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder_v1_1.C
View file
Expand Up @@ -38,7 +38,7 @@
// mss lib
#include <lib/spd/common/spd_decoder.H>
#include <lib/utils/checker.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/conversions.H>
#include <lib/utils/find.H>

Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_0.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -43,7 +43,7 @@
#include <lib/spd/lrdimm/lrdimm_decoder.H>
#include <lib/spd/common/spd_decoder.H>
#include <lib/utils/checker.H>
#include <lib/utils/c_str.H>
#include <c_str.H>
#include <lib/utils/find.H>

using fapi2::TARGET_TYPE_MCA;
Expand Down

0 comments on commit 10c47be

Please sign in to comment.