diff options
Diffstat (limited to 'src/usr/hwpf/hwp')
27 files changed, 246 insertions, 219 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/makefile b/src/usr/hwpf/hwp/activate_powerbus/makefile index 300a25644..2f439ea7b 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/makefile +++ b/src/usr/hwpf/hwp/activate_powerbus/makefile @@ -38,7 +38,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/edi_ei_initialization EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/edi_ei_initialization/proc_fab_iovalid EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars -## NOTE: add the base istep dir here. +## NOTE: add the base istep dir here. EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/activate_powerbus ## Include sub dirs @@ -49,11 +49,15 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp ## NOTE: add new object files when you add a new HWP -OBJS = activate_powerbus.o \ - proc_build_smp.o proc_build_smp_adu.o proc_build_smp_epsilon.o \ - proc_build_smp_fbc_ab.o proc_build_smp_fbc_cd.o \ - proc_build_smp_fbc_nohp.o proc_adu_utils.o - +OBJS += activate_powerbus.o +OBJS += proc_build_smp.o +OBJS += proc_build_smp_adu.o +OBJS += proc_build_smp_epsilon.o +OBJS += proc_build_smp_fbc_ab.o +OBJS += proc_build_smp_fbc_cd.o +OBJS += proc_build_smp_fbc_nohp.o +OBJS += proc_adu_utils.o + ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: # VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/activate_powerbus/<HWP_dir> diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk index 8c82a329b..0fef9e249 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk +++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk @@ -47,25 +47,24 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_uti CFLAGS += -D __FAPI ## NOTE: add new object files when you add a new HWP -OBJS += \ - p8_image_help.o \ - p8_scan_compression.o \ - pore_inline_assembler.o \ - p8_pba_bar_config.o \ - sbe_xip_image.o \ - p8_pore_table_static_data.o \ - p8_pore_table_gen_api_fixed.o \ - p8_pmc_deconfig_setup.o \ - p8_poreslw_init.o \ - p8_set_pore_bar.o \ - p8_xip_customize.o \ - p8_ring_identification.o \ - p8_slw_build_fixed.o \ - p8_image_help_base.o \ - p8_pfet_init.o \ - p8_pfet_control.o \ - p8_block_wakeup_intr.o \ - p8_mailbox_utils.o +OBJS += p8_image_help.o +OBJS += p8_scan_compression.o +OBJS += pore_inline_assembler.o +OBJS += p8_pba_bar_config.o +OBJS += sbe_xip_image.o +OBJS += p8_pore_table_static_data.o +OBJS += p8_pore_table_gen_api_fixed.o +OBJS += p8_pmc_deconfig_setup.o +OBJS += p8_poreslw_init.o +OBJS += p8_set_pore_bar.o +OBJS += p8_xip_customize.o +OBJS += p8_ring_identification.o +OBJS += p8_slw_build_fixed.o +OBJS += p8_image_help_base.o +OBJS += p8_pfet_init.o +OBJS += p8_pfet_control.o +OBJS += p8_block_wakeup_intr.o +OBJS += p8_mailbox_utils.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: diff --git a/src/usr/hwpf/hwp/build_winkle_images/makefile b/src/usr/hwpf/hwp/build_winkle_images/makefile index 4d3693c06..74f7e3845 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/makefile +++ b/src/usr/hwpf/hwp/build_winkle_images/makefile @@ -24,10 +24,10 @@ ROOTPATH = ../../../../.. MODULE = build_winkle_images -SUBDIRS = runtime.d +SUBDIRS += runtime.d # objects unique to HB IPL -OBJS = build_winkle_images.o +OBJS += build_winkle_images.o # include objs common to HBRT and HB IPL include build_winkle_images.mk diff --git a/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile b/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile index b52011db7..99b847327 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile +++ b/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile @@ -27,7 +27,7 @@ HOSTBOOT_RUNTIME = 1 MODULE = build_winkle_images_rt # objects unique to HBRT - currently none -# OBJS = +# OBJS += # include objs common to HBRT and HB IPL include ../build_winkle_images.mk diff --git a/src/usr/hwpf/hwp/bus_training/makefile b/src/usr/hwpf/hwp/bus_training/makefile index dcfc2552a..7a5183129 100644 --- a/src/usr/hwpf/hwp/bus_training/makefile +++ b/src/usr/hwpf/hwp/bus_training/makefile @@ -36,19 +36,22 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training ## pointer to common HWP files EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include -OBJS = gcr_funcs.o io_funcs.o io_run_training.o pbusLinkSvc.o \ - io_dccal.o \ - io_power_down_lanes.o \ - io_read_erepair.o \ - io_clear_firs.o \ - io_fir_isolation.o \ - io_restore_erepair.o \ - erepairAccessorHwpFuncs.o \ - erepairGetFailedLanesHwp.o \ - erepairSetFailedLanesHwp.o \ - io_post_trainadv.o \ - io_pre_trainadv.o \ - io_cleanup.o +OBJS += gcr_funcs.o +OBJS += io_funcs.o +OBJS += io_run_training.o +OBJS += pbusLinkSvc.o +OBJS += io_dccal.o +OBJS += io_power_down_lanes.o +OBJS += io_read_erepair.o +OBJS += io_clear_firs.o +OBJS += io_fir_isolation.o +OBJS += io_restore_erepair.o +OBJS += erepairAccessorHwpFuncs.o +OBJS += erepairGetFailedLanesHwp.o +OBJS += erepairSetFailedLanesHwp.o +OBJS += io_post_trainadv.o +OBJS += io_pre_trainadv.o +OBJS += io_cleanup.o ## NOTE: add a new directory onto the vpaths when you add a new HWP diff --git a/src/usr/hwpf/hwp/core_activate/makefile b/src/usr/hwpf/hwp/core_activate/makefile index c0159a1d6..ade901c3d 100644 --- a/src/usr/hwpf/hwp/core_activate/makefile +++ b/src/usr/hwpf/hwp/core_activate/makefile @@ -55,14 +55,14 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures ## NOTE: add new object files when you add a new HWP -OBJS = core_activate.o \ - proc_prep_master_winkle.o \ - proc_stop_deadman_timer.o \ - proc_switch_cfsim.o \ - proc_switch_rec_attn.o \ - cen_switch_rec_attn.o \ - proc_post_winkle.o \ - proc_check_slw_done.o +OBJS += core_activate.o +OBJS += proc_prep_master_winkle.o +OBJS += proc_stop_deadman_timer.o +OBJS += proc_switch_cfsim.o +OBJS += proc_switch_rec_attn.o +OBJS += cen_switch_rec_attn.o +OBJS += proc_post_winkle.o +OBJS += proc_check_slw_done.o diff --git a/src/usr/hwpf/hwp/dmi_training/makefile b/src/usr/hwpf/hwp/dmi_training/makefile index 18f8056a5..e98628ac0 100644 --- a/src/usr/hwpf/hwp/dmi_training/makefile +++ b/src/usr/hwpf/hwp/dmi_training/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -47,15 +47,15 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training/io_post_trainadv EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dmi_training/cen_dmi_scominit -OBJS = dmi_training.o \ - proc_cen_framelock.o \ - dmi_io_run_training.o \ - proc_cen_set_inband_addr.o \ - mss_get_cen_ecid.o \ - dmi_io_dccal.o \ - proc_dmi_scominit.o \ - cen_dmi_scominit.o \ - mss_get_cen_ecid_decode.o +OBJS += dmi_training.o +OBJS += proc_cen_framelock.o +OBJS += dmi_io_run_training.o +OBJS += proc_cen_set_inband_addr.o +OBJS += mss_get_cen_ecid.o +OBJS += dmi_io_dccal.o +OBJS += proc_dmi_scominit.o +OBJS += cen_dmi_scominit.o +OBJS += mss_get_cen_ecid_decode.o ## NOTE: add a new directory onto the vpaths when you add a new HWP VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock diff --git a/src/usr/hwpf/hwp/dram_initialization/makefile b/src/usr/hwpf/hwp/dram_initialization/makefile index d1d4fe57c..0e0731a61 100644 --- a/src/usr/hwpf/hwp/dram_initialization/makefile +++ b/src/usr/hwpf/hwp/dram_initialization/makefile @@ -56,18 +56,18 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dram_initialization/mss_power_cleanu EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dram_initialization/proc_throttle_sync ## NOTE: add new object files when you add a new HWP -OBJS = dram_initialization.o \ - proc_exit_cache_contained.o \ - mss_extent_setup.o \ - mss_setup_bars.o \ - proc_fab_smp.o \ - proc_setup_bars.o \ - proc_pcie_config.o \ - proc_mpipl_ex_cleanup.o \ - proc_mpipl_chip_cleanup.o \ - mss_thermal_init.o \ - mss_power_cleanup.o \ - proc_throttle_sync.o +OBJS += dram_initialization.o +OBJS += proc_exit_cache_contained.o +OBJS += mss_extent_setup.o +OBJS += mss_setup_bars.o +OBJS += proc_fab_smp.o +OBJS += proc_setup_bars.o +OBJS += proc_pcie_config.o +OBJS += proc_mpipl_ex_cleanup.o +OBJS += proc_mpipl_chip_cleanup.o +OBJS += mss_thermal_init.o +OBJS += mss_power_cleanup.o +OBJS += proc_throttle_sync.o ## NOTE: add a new directory onto the vpaths when you add a new HWP diff --git a/src/usr/hwpf/hwp/dram_training/makefile b/src/usr/hwpf/hwp/dram_training/makefile index e13d5ac22..f60f07f09 100644 --- a/src/usr/hwpf/hwp/dram_training/makefile +++ b/src/usr/hwpf/hwp/dram_training/makefile @@ -55,27 +55,27 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dram_training/cen_stopclocks EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dram_initialization/proc_throttle_sync ## NOTE: add new object files when you add a new HWP -OBJS = dram_training.o \ - mss_draminit.o \ - mss_funcs.o \ - mss_draminit_mc.o \ - mss_draminit_training.o \ - mss_ddr_phy_reset.o \ - mss_termination_control.o \ - cen_mem_startclocks.o \ - mss_scominit.o \ - cen_mem_pll_initf.o \ - cen_mem_pll_setup.o \ - mss_draminit_training_advanced.o \ - mss_access_delay_reg.o \ - mss_generic_shmoo.o \ - mss_mcbist.o \ - mss_mcbist_common.o\ - hbVddrMsg.o \ - mss_mcbist_address.o \ - mss_dimm_power_test.o \ - mss_lrdimm_funcs.o \ - cen_stopclocks.o +OBJS += dram_training.o +OBJS += mss_draminit.o +OBJS += mss_funcs.o +OBJS += mss_draminit_mc.o +OBJS += mss_draminit_training.o +OBJS += mss_ddr_phy_reset.o +OBJS += mss_termination_control.o +OBJS += cen_mem_startclocks.o +OBJS += mss_scominit.o +OBJS += cen_mem_pll_initf.o +OBJS += cen_mem_pll_setup.o +OBJS += mss_draminit_training_advanced.o +OBJS += mss_access_delay_reg.o +OBJS += mss_generic_shmoo.o +OBJS += mss_mcbist.o +OBJS += mss_mcbist_common.o +OBJS += hbVddrMsg.o +OBJS += mss_mcbist_address.o +OBJS += mss_dimm_power_test.o +OBJS += mss_lrdimm_funcs.o +OBJS += cen_stopclocks.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ##@ VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/??? diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/makefile b/src/usr/hwpf/hwp/edi_ei_initialization/makefile index b084780d7..6e36780f7 100644 --- a/src/usr/hwpf/hwp/edi_ei_initialization/makefile +++ b/src/usr/hwpf/hwp/edi_ei_initialization/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -35,7 +35,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training -## NOTE: add the base istep dir here. +## NOTE: add the base istep dir here. EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/edi_ei_initialization ## Include sub dirs @@ -49,8 +49,10 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training/io_pre_trainadv EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training/io_post_trainadv ## NOTE: add new object files when you add a new HWP -OBJS = edi_ei_initialization.o \ - proc_fab_iovalid.o fabric_io_run_training.o fabric_io_dccal.o +OBJS += edi_ei_initialization.o +OBJS += proc_fab_iovalid.o +OBJS += fabric_io_run_training.o +OBJS += fabric_io_dccal.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: diff --git a/src/usr/hwpf/hwp/establish_system_smp/makefile b/src/usr/hwpf/hwp/establish_system_smp/makefile index e6f00f861..e9a88bd74 100644 --- a/src/usr/hwpf/hwp/establish_system_smp/makefile +++ b/src/usr/hwpf/hwp/establish_system_smp/makefile @@ -49,7 +49,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures ## NOTE: add new object files when you add a new HWP -OBJS = establish_system_smp.o +OBJS += establish_system_smp.o ## NOTE: add a new directory onto the vpaths when you add a new HWP diff --git a/src/usr/hwpf/hwp/hwp.mk b/src/usr/hwpf/hwp/hwp.mk index ddbe47c8c..5e05826ff 100644 --- a/src/usr/hwpf/hwp/hwp.mk +++ b/src/usr/hwpf/hwp/hwp.mk @@ -29,11 +29,11 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build -OBJS += dimmBadDqBitmapAccessHwp.o \ - dimmBadDqBitmapFuncs.o \ - fapiTestHwpError.o \ - fapiTestHwpFfdc.o \ - fapiTestHwpConfig.o +OBJS += dimmBadDqBitmapAccessHwp.o +OBJS += dimmBadDqBitmapFuncs.o +OBJS += fapiTestHwpError.o +OBJS += fapiTestHwpFfdc.o +OBJS += fapiTestHwpConfig.o include ${ROOTPATH}/src/usr/hwpf/hwp/mvpd_accessors/mvpd.mk include ${ROOTPATH}/src/usr/hwpf/hwp/pll_accessors/pll.mk diff --git a/src/usr/hwpf/hwp/makefile b/src/usr/hwpf/hwp/makefile index a80baf8e1..fa00a5292 100644 --- a/src/usr/hwpf/hwp/makefile +++ b/src/usr/hwpf/hwp/makefile @@ -28,18 +28,32 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/initservice/istepdispatcher include hwp.mk -OBJS += fapiTestHwp.o \ - fapiTestHwpDq.o \ - fapiHwpExecInitFile.o \ - hwpisteperror.o \ - hwpistepud.o +OBJS += fapiTestHwp.o +OBJS += fapiTestHwpDq.o +OBJS += fapiHwpExecInitFile.o +OBJS += hwpisteperror.o +OBJS += hwpistepud.o -SUBDIRS = dmi_training.d sbe_centaur_init.d mc_config.d \ - dram_training.d activate_powerbus.d build_winkle_images.d \ - core_activate.d dram_initialization.d edi_ei_initialization.d \ - establish_system_smp.d bus_training.d occ.d tod_init.d \ - nest_chiplets.d start_payload.d thread_activate.d slave_sbe.d \ - pstates.d proc_hwreconfig.d runtime.d +SUBDIRS += dmi_training.d +SUBDIRS += sbe_centaur_init.d +SUBDIRS += mc_config.d +SUBDIRS += dram_training.d +SUBDIRS += activate_powerbus.d +SUBDIRS += build_winkle_images.d +SUBDIRS += core_activate.d +SUBDIRS += dram_initialization.d +SUBDIRS += edi_ei_initialization.d +SUBDIRS += establish_system_smp.d +SUBDIRS += bus_training.d +SUBDIRS += occ.d +SUBDIRS += tod_init.d +SUBDIRS += nest_chiplets.d +SUBDIRS += start_payload.d +SUBDIRS += thread_activate.d +SUBDIRS += slave_sbe.d +SUBDIRS += pstates.d +SUBDIRS += proc_hwreconfig.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/hwpf/hwp/mc_config/makefile b/src/usr/hwpf/hwp/mc_config/makefile index dfdac47e2..ff8dc8fae 100644 --- a/src/usr/hwpf/hwp/mc_config/makefile +++ b/src/usr/hwpf/hwp/mc_config/makefile @@ -44,23 +44,23 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_eff_pre_config EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_attr_cleanup EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_eff_mb_interleave -OBJS = mc_config.o \ - mss_volt.o \ - mss_freq.o \ - mss_eff_config.o \ - mss_eff_grouping.o \ - opt_memmap.o \ - mss_eff_config_thermal.o \ - mss_eff_config_termination.o \ - mss_eff_config_rank_group.o \ - mss_eff_config_cke_map.o \ - mss_bulk_pwr_throttles.o \ - mss_throttle_to_power.o \ - mss_eff_config_shmoo.o \ - mss_error_support.o \ - mss_eff_pre_config.o \ - mss_attr_cleanup.o \ - mss_eff_mb_interleave.o +OBJS += mc_config.o +OBJS += mss_volt.o +OBJS += mss_freq.o +OBJS += mss_eff_config.o +OBJS += mss_eff_grouping.o +OBJS += opt_memmap.o +OBJS += mss_eff_config_thermal.o +OBJS += mss_eff_config_termination.o +OBJS += mss_eff_config_rank_group.o +OBJS += mss_eff_config_cke_map.o +OBJS += mss_bulk_pwr_throttles.o +OBJS += mss_throttle_to_power.o +OBJS += mss_eff_config_shmoo.o +OBJS += mss_error_support.o +OBJS += mss_eff_pre_config.o +OBJS += mss_attr_cleanup.o +OBJS += mss_eff_mb_interleave.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ##@ VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/??? diff --git a/src/usr/hwpf/hwp/mvpd_accessors/mvpd.mk b/src/usr/hwpf/hwp/mvpd_accessors/mvpd.mk index 5be3c56a8..164a03346 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/mvpd.mk +++ b/src/usr/hwpf/hwp/mvpd_accessors/mvpd.mk @@ -25,18 +25,18 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/mvpd_accessors VPATH += ${HWPPATH}/mvpd_accessors -OBJS += getMvpdRing.o \ - getMBvpdRing.o \ - setMvpdRing.o \ - mvpdRingFuncs.o \ - getMvpdExL2SingleMemberEnable.o \ - getMBvpdPhaseRotatorData.o \ - getMBvpdAddrMirrorData.o \ - getMBvpdTermData.o \ - getMBvpdSlopeInterceptData.o \ - getMBvpdSpareDramData.o \ - getMBvpdVersion.o \ - getMBvpdDram2NModeEnabled.o \ - getMBvpdSensorMap.o \ - accessMBvpdL4BankDelete.o +OBJS += getMvpdRing.o +OBJS += getMBvpdRing.o +OBJS += setMvpdRing.o +OBJS += mvpdRingFuncs.o +OBJS += getMvpdExL2SingleMemberEnable.o +OBJS += getMBvpdPhaseRotatorData.o +OBJS += getMBvpdAddrMirrorData.o +OBJS += getMBvpdTermData.o +OBJS += getMBvpdSlopeInterceptData.o +OBJS += getMBvpdSpareDramData.o +OBJS += getMBvpdVersion.o +OBJS += getMBvpdDram2NModeEnabled.o +OBJS += getMBvpdSensorMap.o +OBJS += accessMBvpdL4BankDelete.o diff --git a/src/usr/hwpf/hwp/nest_chiplets/makefile b/src/usr/hwpf/hwp/nest_chiplets/makefile index 841206a98..533c14b3d 100644 --- a/src/usr/hwpf/hwp/nest_chiplets/makefile +++ b/src/usr/hwpf/hwp/nest_chiplets/makefile @@ -44,16 +44,16 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable ## NOTE: add new object files when you add a new HWP -OBJS = nest_chiplets.o \ - proc_start_clocks_chiplets.o \ - proc_chiplet_scominit.o \ - proc_scomoverride_chiplets.o \ - proc_a_x_pci_dmi_pll_initf.o \ - proc_a_x_pci_dmi_pll_setup.o \ - proc_pcie_scominit.o \ - proc_abus_scominit.o \ - proc_xbus_scominit.o \ - proc_a_x_pci_dmi_pll_utils.o +OBJS += nest_chiplets.o +OBJS += proc_start_clocks_chiplets.o +OBJS += proc_chiplet_scominit.o +OBJS += proc_scomoverride_chiplets.o +OBJS += proc_a_x_pci_dmi_pll_initf.o +OBJS += proc_a_x_pci_dmi_pll_setup.o +OBJS += proc_pcie_scominit.o +OBJS += proc_abus_scominit.o +OBJS += proc_xbus_scominit.o +OBJS += proc_a_x_pci_dmi_pll_utils.o ## NOTE: add a new directory onto the vpaths when you add a new HWP VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/nest_chiplets/proc_start_clocks_chiplets diff --git a/src/usr/hwpf/hwp/occ/makefile b/src/usr/hwpf/hwp/occ/makefile index 5b96dff7e..29c184d58 100644 --- a/src/usr/hwpf/hwp/occ/makefile +++ b/src/usr/hwpf/hwp/occ/makefile @@ -24,12 +24,10 @@ ROOTPATH = ../../../../.. MODULE = occ -SUBDIRS = runtime.d - -include occ.mk +SUBDIRS += runtime.d ## Objects unique to HB IPL -OBJS = occ.o +OBJS += occ.o ## Objects common to HB IPL and HBRT include occ.mk diff --git a/src/usr/hwpf/hwp/occ/occ.mk b/src/usr/hwpf/hwp/occ/occ.mk index 79e93a4d7..837c3743b 100644 --- a/src/usr/hwpf/hwp/occ/occ.mk +++ b/src/usr/hwpf/hwp/occ/occ.mk @@ -43,32 +43,31 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ/occ_procedures EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures ## NOTE: add new object files when you add a new HWP -OBJS += \ - p8_pba_init.o \ - p8_pm_init.o \ - p8_pcbs_init.o \ - p8_pmc_init.o \ - p8_poregpe_init.o \ - p8_oha_init.o \ - p8_ocb_init.o \ - p8_pss_init.o \ - p8_occ_control.o \ - p8_occ_sram_init.o \ - p8_pm_firinit.o \ - p8_pm_oha_firinit.o \ - p8_pm_pcbs_firinit.o \ - p8_pm_occ_firinit.o \ - p8_pm_pba_firinit.o \ - p8_pm_pmc_firinit.o \ - p8_pm_utils.o +OBJS += p8_pba_init.o +OBJS += p8_pm_init.o +OBJS += p8_pcbs_init.o +OBJS += p8_pmc_init.o +OBJS += p8_poregpe_init.o +OBJS += p8_oha_init.o +OBJS += p8_ocb_init.o +OBJS += p8_pss_init.o +OBJS += p8_occ_control.o +OBJS += p8_occ_sram_init.o +OBJS += p8_pm_firinit.o +OBJS += p8_pm_oha_firinit.o +OBJS += p8_pm_pcbs_firinit.o +OBJS += p8_pm_occ_firinit.o +OBJS += p8_pm_pba_firinit.o +OBJS += p8_pm_pmc_firinit.o +OBJS += p8_pm_utils.o #These procedures are included per Stradale's request so #they can implement OCC Reset. -OBJS+= p8_pm_prep_for_reset.o \ - p8_pmc_force_vsafe.o \ - p8_ocb_indir_access.o \ - p8_ocb_indir_setup_linear.o +OBJS += p8_pm_prep_for_reset.o +OBJS += p8_pmc_force_vsafe.o +OBJS += p8_ocb_indir_access.o +OBJS += p8_ocb_indir_setup_linear.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: diff --git a/src/usr/hwpf/hwp/occ/runtime/makefile b/src/usr/hwpf/hwp/occ/runtime/makefile index 1d1e7ce06..3d5c93804 100644 --- a/src/usr/hwpf/hwp/occ/runtime/makefile +++ b/src/usr/hwpf/hwp/occ/runtime/makefile @@ -29,7 +29,7 @@ VPATH += ../ MODULE = occ_rt ## Objects unique to HBRT -OBJS = rt_occ.o +OBJS += rt_occ.o ## Objects common to HBRT and HB IPL include ../occ.mk diff --git a/src/usr/hwpf/hwp/proc_hwreconfig/makefile b/src/usr/hwpf/hwp/proc_hwreconfig/makefile index 114e6af58..3f39fc510 100644 --- a/src/usr/hwpf/hwp/proc_hwreconfig/makefile +++ b/src/usr/hwpf/hwp/proc_hwreconfig/makefile @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/hwpf/hwp/edi_ei_initialization/makefile $ +# $Source: src/usr/hwpf/hwp/proc_hwreconfig/makefile $ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -45,7 +45,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/proc_hwreconfig EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig ## NOTE: add new object files when you add a new HWP -OBJS = proc_enable_reconfig.o +OBJS += proc_enable_reconfig.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: diff --git a/src/usr/hwpf/hwp/pstates/makefile b/src/usr/hwpf/hwp/pstates/makefile index 80e3d6caf..41995881e 100644 --- a/src/usr/hwpf/hwp/pstates/makefile +++ b/src/usr/hwpf/hwp/pstates/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -45,12 +45,12 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/ ## NOTE: add new object files when you add a new HWP -OBJS = gpstCheckByte.o \ - lab_pstates.o \ - p8_build_pstate_datablock.o \ - proc_get_voltage.o \ - pstates.o \ - pstate_tables.o +OBJS += gpstCheckByte.o +OBJS += lab_pstates.o +OBJS += p8_build_pstate_datablock.o +OBJS += proc_get_voltage.o +OBJS += pstates.o +OBJS += pstate_tables.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ##@ VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/??? diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/makefile b/src/usr/hwpf/hwp/sbe_centaur_init/makefile index e3792a837..55c4a5537 100644 --- a/src/usr/hwpf/hwp/sbe_centaur_init/makefile +++ b/src/usr/hwpf/hwp/sbe_centaur_init/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -46,7 +46,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mvpd_accessors -OBJS = sbe_centaur_init.o cen_xip_customize.o +OBJS += sbe_centaur_init.o +OBJS += cen_xip_customize.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ## VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/sbe_centaur_init/???? diff --git a/src/usr/hwpf/hwp/slave_sbe/makefile b/src/usr/hwpf/hwp/slave_sbe/makefile index 71268e7da..452d3c89e 100644 --- a/src/usr/hwpf/hwp/slave_sbe/makefile +++ b/src/usr/hwpf/hwp/slave_sbe/makefile @@ -45,16 +45,16 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_uti ## NOTE: add new object files when you add a new HWP -OBJS = slave_sbe.o \ - proc_revert_sbe_mcs_setup.o \ - proc_check_slave_sbe_seeprom_complete.o \ - proc_extract_sbe_rc.o \ - proc_read_seeprom.o \ - proc_getecid.o \ - proc_cen_ref_clk_enable.o \ - proc_spless_sbe_startWA.o \ - proc_reset_i2cm_bus_fence.o \ - proc_check_master_sbe_seeprom.o +OBJS += slave_sbe.o +OBJS += proc_revert_sbe_mcs_setup.o +OBJS += proc_check_slave_sbe_seeprom_complete.o +OBJS += proc_extract_sbe_rc.o +OBJS += proc_read_seeprom.o +OBJS += proc_getecid.o +OBJS += proc_cen_ref_clk_enable.o +OBJS += proc_spless_sbe_startWA.o +OBJS += proc_reset_i2cm_bus_fence.o +OBJS += proc_check_master_sbe_seeprom.o ## NOTE: add a new directory onto the vpaths when you add a new HWP VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable diff --git a/src/usr/hwpf/hwp/start_payload/makefile b/src/usr/hwpf/hwp/start_payload/makefile index 209fc281c..87f5d50c9 100644 --- a/src/usr/hwpf/hwp/start_payload/makefile +++ b/src/usr/hwpf/hwp/start_payload/makefile @@ -46,7 +46,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build ## NOTE: add new object files when you add a new HWP -OBJS = start_payload.o +OBJS += start_payload.o ## NOTE: add a new directory onto the vpaths when you add a new HWP diff --git a/src/usr/hwpf/hwp/thread_activate/makefile b/src/usr/hwpf/hwp/thread_activate/makefile index 9a1b2df57..ae916cd66 100644 --- a/src/usr/hwpf/hwp/thread_activate/makefile +++ b/src/usr/hwpf/hwp/thread_activate/makefile @@ -33,7 +33,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp ## pointer to common HWP files EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include -## NOTE: add the base istep dir here. +## NOTE: add the base istep dir here. EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/thread_activate ## Include sub dirs @@ -44,10 +44,10 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/thread_activate/proc_thread_control EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures ## NOTE: add new object files when you add a new HWP -OBJS = thread_activate.o \ - proc_thread_control.o +OBJS += thread_activate.o +OBJS += proc_thread_control.o + - ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: # VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/thread_activate/<HWP_dir> diff --git a/src/usr/hwpf/hwp/tod_init/makefile b/src/usr/hwpf/hwp/tod_init/makefile index 1afa12a34..2611027a8 100644 --- a/src/usr/hwpf/hwp/tod_init/makefile +++ b/src/usr/hwpf/hwp/tod_init/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -47,14 +47,18 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/tod_init/proc_tod_init ## NOTE: add new object files when you add a new HWP -OBJS = tod_init.o \ - TodControls.o TodDrawer.o TodProc.o \ - TodSvc.o TodSvcUtil.o TodHwpIntf.o \ - TodTopologyManager.o \ - proc_tod_setup.o \ - proc_tod_save_config.o \ - proc_tod_init.o \ - proc_tod_utils.o +OBJS += tod_init.o +OBJS += TodControls.o +OBJS += TodDrawer.o +OBJS += TodProc.o +OBJS += TodSvc.o +OBJS += TodSvcUtil.o +OBJS += TodHwpIntf.o +OBJS += TodTopologyManager.o +OBJS += proc_tod_setup.o +OBJS += proc_tod_save_config.o +OBJS += proc_tod_init.o +OBJS += proc_tod_utils.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ##@ VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/??? diff --git a/src/usr/hwpf/hwp/utility_procedures/utils.mk b/src/usr/hwpf/hwp/utility_procedures/utils.mk index 6ac6c0d22..ac287b762 100644 --- a/src/usr/hwpf/hwp/utility_procedures/utils.mk +++ b/src/usr/hwpf/hwp/utility_procedures/utils.mk @@ -28,6 +28,9 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar VPATH += ${HWPPATH}/utility_procedures -OBJS += mss_unmask_errors.o mss_maint_cmds.o -OBJS += p8_cpu_special_wakeup.o proc_cpu_special_wakeup.o +OBJS += mss_unmask_errors.o +OBJS += mss_maint_cmds.o + +OBJS += p8_cpu_special_wakeup.o +OBJS += proc_cpu_special_wakeup.o |
