diff options
Diffstat (limited to 'src/usr/diag/prdf')
| -rw-r--r-- | src/usr/diag/prdf/common/framework/prdf_framework.mk | 80 | ||||
| -rw-r--r-- | src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk | 43 | ||||
| -rw-r--r-- | src/usr/diag/prdf/framework/prdfDumpResolution.C (renamed from src/usr/diag/prdf/framework/resolution/prdfDumpResolution.C) | 6 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/framework/prdfFileRegisterAccess.C (renamed from src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C) | 4 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/framework/prdfFileRegisterAccess.H (renamed from src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.H) | 4 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/makefile | 3 | ||||
| -rw-r--r-- | src/usr/diag/prdf/prdf_hb_only.mk | 14 | ||||
| -rw-r--r-- | src/usr/diag/prdf/runtime/makefile | 5 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/test/prdf_hb_common_test.mk | 2 |
9 files changed, 98 insertions, 63 deletions
diff --git a/src/usr/diag/prdf/common/framework/prdf_framework.mk b/src/usr/diag/prdf/common/framework/prdf_framework.mk new file mode 100644 index 000000000..f1b62350a --- /dev/null +++ b/src/usr/diag/prdf/common/framework/prdf_framework.mk @@ -0,0 +1,80 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/prdf/common/framework/prdf_framework.mk $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG + +# NOTE: PRD_SRC_PATH must be defined before including this file. + +################################################################################ +# Paths common to both FSP and Hostboot +################################################################################ + +prd_vpath += ${PRD_SRC_PATH}/common/framework/config +prd_vpath += ${PRD_SRC_PATH}/common/framework/register +prd_vpath += ${PRD_SRC_PATH}/common/framework/resolution +prd_vpath += ${PRD_SRC_PATH}/common/framework/service + +prd_incpath += ${PRD_SRC_PATH}/common/framework/config +prd_incpath += ${PRD_SRC_PATH}/common/framework/register +prd_incpath += ${PRD_SRC_PATH}/common/framework/resolution +prd_incpath += ${PRD_SRC_PATH}/common/framework/service + +################################################################################ +# Object files common to both FSP and Hostboot +################################################################################ + +# common/framework/config/ +prd_obj += iipchip.o +prd_obj += iipConfigurator.o +prd_obj += iipDomain.o +prd_obj += iipDomainContainer.o +prd_obj += iipSystem.o +prd_obj += prdfExtensibleDomain.o +prd_obj += prdfParentDomain.o +prd_obj += prdfRuleChipDomain.o + +# common/framework/register/ +prd_obj += iipscr.o +prd_obj += prdfCaptureData.o +prd_obj += prdfErrorRegister.o +prd_obj += prdfErrorRegisterMask.o +prd_obj_no_sim += prdfHomRegisterAccess.o +prd_obj += prdfRegisterCache.o +prd_obj += prdfResetErrorRegister.o +prd_obj += prdfScanFacility.o +prd_obj += prdfScomRegisterAccess.o +prd_obj += prdfScomRegister.o + +# common/framework/resolution/ +prd_obj += iipResolution.o +prd_obj += iipResolutionFactory.o +prd_obj += prdfCaptureResolution.o +prd_obj += prdfClockResolution.o +prd_obj += prdfResolutionMap.o +prd_obj += prdfThresholdResolutions.o +prd_obj += xspprdFlagResolution.o + +# common/framework/service/ +prd_obj += prdfServiceDataCollector.o +prd_obj += xspprdsdbug.o + diff --git a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk index 2dfeb613d..b5a5177f1 100644 --- a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk +++ b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk @@ -31,10 +31,6 @@ prd_vpath += ${PRD_SRC_PATH}/common prd_vpath += ${PRD_SRC_PATH}/common/include -prd_vpath += ${PRD_SRC_PATH}/common/framework/config -prd_vpath += ${PRD_SRC_PATH}/common/framework/register -prd_vpath += ${PRD_SRC_PATH}/common/framework/resolution -prd_vpath += ${PRD_SRC_PATH}/common/framework/service prd_vpath += ${PRD_SRC_PATH}/common/mnfgtools prd_vpath += ${PRD_SRC_PATH}/common/plat prd_vpath += ${PRD_SRC_PATH}/common/plat/pegasus @@ -43,10 +39,6 @@ prd_vpath += ${PRD_SRC_PATH}/common/rule prd_vpath += ${PRD_SRC_PATH}/common/util prd_incpath += ${PRD_SRC_PATH}/common -prd_incpath += ${PRD_SRC_PATH}/common/framework/config -prd_incpath += ${PRD_SRC_PATH}/common/framework/register -prd_incpath += ${PRD_SRC_PATH}/common/framework/resolution -prd_incpath += ${PRD_SRC_PATH}/common/framework/service prd_incpath += ${PRD_SRC_PATH}/common/mnfgtools prd_incpath += ${PRD_SRC_PATH}/common/plat prd_incpath += ${PRD_SRC_PATH}/common/plat/pegasus @@ -62,41 +54,6 @@ prd_incpath += ${PRD_SRC_PATH}/common/util prd_obj += prdfMain_common.o prd_obj += prdfTrace.o -# common/framework/config/ -prd_obj += iipchip.o -prd_obj += iipConfigurator.o -prd_obj += iipDomain.o -prd_obj += iipDomainContainer.o -prd_obj += iipSystem.o -prd_obj += prdfExtensibleDomain.o -prd_obj += prdfParentDomain.o -prd_obj += prdfRuleChipDomain.o - -# common/framework/register/ -prd_obj += iipscr.o -prd_obj += prdfCaptureData.o -prd_obj += prdfErrorRegister.o -prd_obj += prdfErrorRegisterMask.o -prd_obj_no_sim += prdfHomRegisterAccess.o -prd_obj += prdfRegisterCache.o -prd_obj += prdfResetErrorRegister.o -prd_obj += prdfScanFacility.o -prd_obj += prdfScomRegisterAccess.o -prd_obj += prdfScomRegister.o - -# common/framework/resolution/ -prd_obj += iipResolution.o -prd_obj += iipResolutionFactory.o -prd_obj += prdfCaptureResolution.o -prd_obj += prdfClockResolution.o -prd_obj += prdfResolutionMap.o -prd_obj += prdfThresholdResolutions.o -prd_obj += xspprdFlagResolution.o - -# common/framework/service/ -prd_obj += prdfServiceDataCollector.o -prd_obj += xspprdsdbug.o - # common/mnfgtools/ prd_obj += prdfMfgThreshold.o prd_obj += prdfMfgThresholdMgr.o diff --git a/src/usr/diag/prdf/framework/resolution/prdfDumpResolution.C b/src/usr/diag/prdf/framework/prdfDumpResolution.C index 7424fe7da..3d4a8267e 100644 --- a/src/usr/diag/prdf/framework/resolution/prdfDumpResolution.C +++ b/src/usr/diag/prdf/framework/prdfDumpResolution.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/framework/resolution/prdfDumpResolution.C $ */ +/* $Source: src/usr/diag/prdf/framework/prdfDumpResolution.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2001,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C index 0189c3567..c68cf18d4 100755 --- a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C +++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C $ */ +/* $Source: src/usr/diag/prdf/framework/prdfFileRegisterAccess.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.H b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H index b70c33959..875b2ad1d 100755 --- a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.H +++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.H $ */ +/* $Source: src/usr/diag/prdf/framework/prdfFileRegisterAccess.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile index 7bea465eb..c70d1ce36 100755 --- a/src/usr/diag/prdf/makefile +++ b/src/usr/diag/prdf/makefile @@ -35,8 +35,9 @@ SUBDIRS += test.d # ROOTPATH must be defined before including this file. include prdf_hb_only.mk # Will define PRD_SRC_PATH and PRD_INC_PATH -# PRD_SRC_PATH and PRD_INC_PATH must be defined before including this file. +# PRD_SRC_PATH and PRD_INC_PATH must be defined before including these files. include common/prdf_common_fsp_and_hb.mk +include common/framework/prdf_framework.mk VPATH += ${prd_vpath} diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk index d21316114..a73a041fa 100644 --- a/src/usr/diag/prdf/prdf_hb_only.mk +++ b/src/usr/diag/prdf/prdf_hb_only.mk @@ -34,10 +34,7 @@ PRD_INC_PATH = ${ROOTPATH}/src/include/usr/diag/prdf ################################################################################ prd_vpath += ${PRD_SRC_PATH} -prd_vpath += ${PRD_SRC_PATH}/framework/config -prd_vpath += ${PRD_SRC_PATH}/framework/resolution -prd_vpath += ${PRD_SRC_PATH}/framework/service -prd_vpath += ${PRD_SRC_PATH}/framework/register +prd_vpath += ${PRD_SRC_PATH}/framework prd_vpath += ${PRD_SRC_PATH}/mnfgtools prd_vpath += ${PRD_SRC_PATH}/occ_firdata prd_vpath += ${PRD_SRC_PATH}/plat @@ -47,10 +44,7 @@ prd_vpath += ${PRD_SRC_PATH}/plat/pegasus prd_incpath += ${PRD_INC_PATH} # Stored differently in FSP prd_incpath += ${PRD_INC_PATH}/common # Stored differently in FSP prd_incpath += ${PRD_SRC_PATH} -prd_incpath += ${PRD_SRC_PATH}/framework/config -prd_incpath += ${PRD_SRC_PATH}/framework/resolution -prd_incpath += ${PRD_SRC_PATH}/framework/register -prd_incpath += ${PRD_SRC_PATH}/framework/service +prd_incpath += ${PRD_SRC_PATH}/framework prd_incpath += ${PRD_SRC_PATH}/mnfgtools prd_incpath += ${PRD_SRC_PATH}/occ_firdata prd_incpath += ${PRD_SRC_PATH}/plat @@ -74,7 +68,7 @@ prd_incpath += ${ROOTPATH}/src/include/usr/util # ./ prd_obj += prdfMain.o -# framework/resolution/ +# framework prd_obj += prdfDumpResolution.o # plat/ @@ -97,7 +91,7 @@ ifneq (${HOSTBOOT_RUNTIME},1) # ./ prd_obj += prdfMain_ipl.o -# framework/register +# framework prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfFileRegisterAccess.o) # mnfgtools/ diff --git a/src/usr/diag/prdf/runtime/makefile b/src/usr/diag/prdf/runtime/makefile index 9cee88060..7843c011e 100644 --- a/src/usr/diag/prdf/runtime/makefile +++ b/src/usr/diag/prdf/runtime/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2014 +# Contributors Listed Below - COPYRIGHT 2014,2016 # [+] International Business Machines Corp. # # @@ -34,8 +34,9 @@ SUBDIRS += test.d # ROOTPATH must be defined before including this file. include ../prdf_hb_only.mk # Will define PRD_SRC_PATH and PRD_INC_PATH -# PRD_SRC_PATH and PRD_INC_PATH must be defined before including this file. +# PRD_SRC_PATH and PRD_INC_PATH must be defined before including these files. include ../common/prdf_common_fsp_and_hb.mk +include ../common/framework/prdf_framework.mk VPATH += ${prd_vpath} diff --git a/src/usr/diag/prdf/test/prdf_hb_common_test.mk b/src/usr/diag/prdf/test/prdf_hb_common_test.mk index f85ee1dd9..855d1badd 100755 --- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk +++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk @@ -46,7 +46,7 @@ EXTRAINCDIR += ${PRD_USR_PATH}/common/plat EXTRAINCDIR += ${PRD_USR_PATH}/common/plat/pegasus EXTRAINCDIR += ${PRD_USR_PATH}/common/mnfgtools EXTRAINCDIR += ${PRD_USR_PATH}/mnfgtools -EXTRAINCDIR += ${PRD_USR_PATH}/framework/service +EXTRAINCDIR += ${PRD_USR_PATH}/framework EXTRAINCDIR += ${PRD_USR_PATH}/occ_firdata EXTRAINCDIR += ${PRD_USR_PATH}/plat EXTRAINCDIR += ${PRD_USR_PATH}/test |
