Skip to content

Commit

Permalink
Remove some Centaur procedures from Axone compile
Browse files Browse the repository at this point in the history 
The Axone compile is getting large so this is trimming a few
unneeded HWPs from the image.

Change-Id: If49afacae3f53ed02ece9e6d23082018f1e6f767
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78563
Tested-by: Jenkins Server <pfd-jenkins+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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
dcrowell77 committed Jun 10, 2019
1 parent d41d0f9 commit bdf0213
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 26 deletions.
6 changes: 5 additions & 1 deletion src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* Contributors Listed Below - COPYRIGHT 2015,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -41,7 +41,9 @@
#include <fapi2.H>
#include <fapi2/plat_hwp_invoker.H>
#include <p9_mss_ddr_phy_reset.H>
#ifndef CONFIG_AXONE
#include <p9c_mss_ddr_phy_reset.H>
#endif

using namespace ERRORLOG;
using namespace ISTEP;
Expand Down Expand Up @@ -103,6 +105,7 @@ void* call_mss_ddr_phy_reset (void *io_pArgs)
} // end l_mcbist loop


#ifndef CONFIG_AXONE
if(l_stepError.getErrorHandle() == NULL)
{
// Get all Centaur targets
Expand Down Expand Up @@ -169,6 +172,7 @@ void* call_mss_ddr_phy_reset (void *io_pArgs)

}
}
#endif

TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"call_mss_ddr_phy_reset exit" );
Expand Down
3 changes: 3 additions & 0 deletions src/usr/isteps/istep13/call_mss_draminit_trainadv.C
View file
Expand Up @@ -110,6 +110,7 @@ class MembufWorkItem: public IStepWorkItem
//******************************************************************************
void MembufWorkItem::operator()()
{
#ifndef CONFIG_AXONE
errlHndl_t l_err = nullptr;

// reset watchdog for each memb as this function can be very slow
Expand Down Expand Up @@ -165,6 +166,8 @@ void MembufWorkItem::operator()()
TARGETING::get_huid(l_mbaTarget));
}
}
#endif

}


Expand Down
4 changes: 3 additions & 1 deletion src/usr/isteps/istep13/call_mss_draminit_training.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* Contributors Listed Below - COPYRIGHT 2015,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -102,6 +102,7 @@ void* call_mss_draminit_training (void *io_pArgs)
}
}

#ifndef CONFIG_AXONE
if(l_stepError.getErrorHandle() == NULL)
{
// Get all Centaur targets
Expand Down Expand Up @@ -169,6 +170,7 @@ void* call_mss_draminit_training (void *io_pArgs)
}

}
#endif

TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"call_mss_draminit_training exit" );
Expand Down
3 changes: 2 additions & 1 deletion src/usr/isteps/istep13/call_mss_scominit.C
View file
Expand Up @@ -43,10 +43,11 @@
#include <fapi2.H>
#include <p9_mss_scominit.H>
#include <p9_throttle_sync.H>
#include <p9c_mss_scominit.H>
#ifdef CONFIG_AXONE
#include <exp_scominit.H>
#include <chipids.H> // for EXPLORER ID
#else
#include <p9c_mss_scominit.H>
#endif

using namespace ERRORLOG;
Expand Down
45 changes: 22 additions & 23 deletions src/usr/isteps/istep13/makefile
View file
Expand Up @@ -98,7 +98,7 @@ include ${P9_PROCEDURES_PATH}/hwp/perv/p9_mem_startclocks.mk
#Scom init
include ${P9_PROCEDURES_PATH}/hwp/memory/p9_mss_scominit.mk
include ${P9_PROCEDURES_PATH}/hwp/nest/p9_throttle_sync.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_scominit.mk
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_scominit.o)

include ${P9_PROCEDURES_PATH}/hwp/initfiles/p9n_ddrphy_scom.mk
include ${P9_PROCEDURES_PATH}/hwp/initfiles/p9n_mca_scom.mk
Expand All @@ -111,28 +111,27 @@ include ${P9_PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_mc.mk
include ${P9_PROCEDURES_PATH}/hwp/memory/p9_mss_ddr_phy_reset.mk
include ${P9_PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_training_adv.mk

include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mcbist.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mcbist_common.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mcbist_address.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_generic_shmoo.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit_mc.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit_training.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_ddr_phy_reset.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit_training_advanced.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mrs6_DDR4.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_ddr4_pda.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_ddr4_funcs.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_termination_control.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_access_delay_reg.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_unmask_errors.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_dimmBadDqBitmapFuncs.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_funcs.mk
include ${CEN_PROCEDURES_PATH}/hwp/initfiles/centaur_mbs_scom.mk
include ${CEN_PROCEDURES_PATH}/hwp/initfiles/centaur_mba_scom.mk
include ${CEN_PROCEDURES_PATH}/hwp/initfiles/centaur_ddrphy_scom.mk
include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_row_repair.mk

OBJS += $(if $(CONFIG_AXONE),,p9c_mss_mcbist.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_mcbist_common.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_mcbist_address.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_generic_shmoo.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_draminit.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_draminit_mc.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_draminit_training.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_ddr_phy_reset.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_draminit_training_advanced.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_mrs6_DDR4.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_ddr4_pda.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_ddr4_funcs.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_termination_control.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_access_delay_reg.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_unmask_errors.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_dimmBadDqBitmapFuncs.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_funcs.o)
OBJS += $(if $(CONFIG_AXONE),,centaur_mbs_scom.o)
OBJS += $(if $(CONFIG_AXONE),,centaur_mba_scom.o)
OBJS += $(if $(CONFIG_AXONE),,centaur_ddrphy_scom.o)
OBJS += $(if $(CONFIG_AXONE),,p9c_mss_row_repair.o)

OBJS += $(if $(CONFIG_AXONE),exp_scominit.o,)
OBJS += $(if $(CONFIG_AXONE),explorer_scom.o,)
Expand Down

0 comments on commit bdf0213

Please sign in to comment.