diff options
42 files changed, 53 insertions, 53 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H index 9442c6639..4259adfa6 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H @@ -40,7 +40,7 @@ #include <lib/mss_attribute_accessors.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/num.H> #include <lib/utils/count_dimm.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H index f44bbcf3d..c81c6827c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/ecc/ecc_traits.H> #include <lib/shared/mss_const.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H index a83ac6f65..d94b39655 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/ecc/ecc_traits.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H index 2fff32c56..0a5c52d15 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H index ede8e6c61..efd24270a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H index 5fa672a2c..a3964bb81 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H index 7122dfe28..baa19c11e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H index 21833b63f..0f69460ad 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H index 67d692921..3639454ae 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H index 02668d3c3..229df0098 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/ecc/ecc_traits.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H index 732f334ad..7f9bc11ec 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #define _MSS_MBS_ERROR_VECTOR_TRAP_H_ #include <fapi2.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H index a91627a2b..ead000d53 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/ecc/ecc_traits.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H index d36d09e57..049f27fb6 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C index 91416c5ea..91b86b350 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/fir/fir.H> #include <lib/fir/check.H> #include <lib/utils/assert_noexit.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H b/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H index b25ab105f..aece31060 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C index 1c970538e..c7d2fe3f3 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/fir/fir.H> #include <lib/fir/memdiags_fir.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C index 7ba8663c1..2f5ee7188 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C @@ -37,7 +37,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/fir/fir.H> #include <lib/fir/unmask.H> #include <lib/workarounds/mcbist_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H index 5ec586f8c..dde8e88c7 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H @@ -42,7 +42,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> #include <lib/dimm/kind.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C index 26bc13526..64d84462b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ #include <lib/mss_attribute_accessors.H> #include <lib/mc/mc.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/dimm/kind.H> #include <lib/utils/find.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C index 4f5b2ad6b..a38857963 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C @@ -36,7 +36,7 @@ #include <fapi2.H> #include <lib/mc/port.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/ecc/ecc.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H index f1a552b98..2b15f8e81 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H @@ -43,7 +43,7 @@ #include <lib/mss_attribute_accessors.H> #include <lib/utils/conversions.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/dimm/rank.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/mcbist/address.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C index db7da4d23..c27ac8cfb 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C @@ -42,7 +42,7 @@ #include <lib/mc/mc.H> #include <lib/mc/xlate.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/dimm/kind.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H index eee9f974e..88019d483 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H @@ -42,7 +42,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/dimm/kind.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H index 843eacdf6..199b3f9de 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/mss_pair.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H index d7b7d2c42..121ae0b38 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C index a7bfb7ba0..b8c44c472 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/phy/apb.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/utils/index.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H index 4252c09eb..a6b5a1e25 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C index 69ceaf8ed..6a9dbdee2 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C @@ -54,7 +54,7 @@ #include <lib/utils/bit_count.H> #include <lib/utils/find.H> #include <lib/utils/dump_regs.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/count_dimm.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C index 9bebfa31e..6897a478e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C @@ -47,7 +47,7 @@ #include <lib/utils/bit_count.H> #include <lib/dimm/rank.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <generic/memory/lib/utils/c_str.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H index 6da7cfd9b..cf5f833f8 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/mss_attribute_accessors.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C index fa1803076..a6cd1600c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/phy/phy_cntrl.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/utils/index.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H index 9473020fa..cdf0acf01 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C index d73a0e5e3..53702bb9a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/phy/seq.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/utils/bit_count.H> #include <lib/eff_config/timing.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H index 989e672d9..ff813fc7f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> #include <mss_attribute_accessors_manual.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H index e2566c111..09348a7ff 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/conversions.H> #include <lib/eff_config/timing.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H index b57a03fa9..ebcffa032 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H @@ -38,7 +38,7 @@ #include <fapi2.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/shared/mss_const.H> #include <lib/utils/conversions.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C index 41f9ee04c..40aed1d1c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <lib/utils/conversions.H> #include <lib/fir/fir.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C index 94cf845b8..53d19a2ba 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C @@ -39,7 +39,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <lib/workarounds/dp16_workarounds.H> #include <lib/phy/dp16.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C index f0433065d..02e6ee099 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <lib/dimm/kind.H> #include <lib/workarounds/mcbist_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C index 53c212f91..6c015198d 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C @@ -38,7 +38,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/workarounds/seq_workarounds.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/mss.H b/src/import/chips/p9/procedures/hwp/memory/mss.H index 8c0c564d2..a163b61e8 100644 --- a/src/import/chips/p9/procedures/hwp/memory/mss.H +++ b/src/import/chips/p9/procedures/hwp/memory/mss.H @@ -37,7 +37,7 @@ #define _MSS_H_ #include <fapi2.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H b/src/import/generic/memory/lib/utils/scom.H index 40ab76dc8..314623e3f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H +++ b/src/import/generic/memory/lib/utils/scom.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H $ */ +/* $Source: src/import/generic/memory/lib/utils/scom.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ |
