From d83e0f05717dc06edc537dcab1deb1758ba7dcf5 Mon Sep 17 00:00:00 2001 From: Doug Gilbert Date: Wed, 19 Feb 2014 16:33:26 -0600 Subject: HB runtime OCC support for Sapphire Change-Id: Ie730f0676fa3e35b030d88da8ce666ee61c413a3 RTC: 76683 Backport: release-fips810 CMVC-Prereq: 922520 CQ: SW256269 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9187 Tested-by: Jenkins Server Reviewed-by: Daniel M. Crowell Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/hwp/occ/makefile | 58 +++++-------------------------------------- 1 file changed, 6 insertions(+), 52 deletions(-) (limited to 'src/usr/hwpf/hwp/occ/makefile') diff --git a/src/usr/hwpf/hwp/occ/makefile b/src/usr/hwpf/hwp/occ/makefile index c8c9178ea..5b96dff7e 100644 --- a/src/usr/hwpf/hwp/occ/makefile +++ b/src/usr/hwpf/hwp/occ/makefile @@ -24,60 +24,14 @@ ROOTPATH = ../../../../.. MODULE = occ -## support for Targeting and fapi -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp +SUBDIRS = runtime.d -## pointer to common HWP files -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include +include occ.mk -## pointer to already consumed procedures. -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures - -## NOTE: add the base istep dir here. -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ - -## Include sub dirs -## NOTE: add a new EXTRAINCDIR when you add a new HWP -## EXAMPLE: -## EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ/ -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ/occ_procedures - - -## NOTE: add new object files when you add a new HWP -OBJS = occ.o \ - 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 - -#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 - -## NOTE: add a new directory onto the vpaths when you add a new HWP -## EXAMPLE: -# VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/occ/ -VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/occ/occ_procedures +## Objects unique to HB IPL +OBJS = occ.o +## Objects common to HB IPL and HBRT +include occ.mk include ${ROOTPATH}/config.mk -- cgit v1.2.1