diff options
Diffstat (limited to 'src/usr')
108 files changed, 1409 insertions, 1226 deletions
diff --git a/src/usr/cxxtest/makefile b/src/usr/cxxtest/makefile index c02f22d8d..b14c85bfe 100644 --- a/src/usr/cxxtest/makefile +++ b/src/usr/cxxtest/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -24,8 +24,10 @@ ROOTPATH = ../../.. MODULE = cxxtest -SUBDIRS=test.d runtime.d +SUBDIRS += test.d +SUBDIRS += runtime.d -OBJS = TestSuite.o cxxtestexec.o +OBJS += TestSuite.o +OBJS += cxxtestexec.o include ${ROOTPATH}/config.mk diff --git a/src/usr/cxxtest/runtime/makefile b/src/usr/cxxtest/runtime/makefile index 4bdab1441..23c94821f 100644 --- a/src/usr/cxxtest/runtime/makefile +++ b/src/usr/cxxtest/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -24,7 +24,8 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = cxxtest_rt -OBJS = TestSuite.o rt_cxxtestexec.o +OBJS += TestSuite.o +OBJS += rt_cxxtestexec.o VPATH += .. diff --git a/src/usr/devicefw/devicefw.mk b/src/usr/devicefw/devicefw.mk index e8a8003c0..27fd0b334 100644 --- a/src/usr/devicefw/devicefw.mk +++ b/src/usr/devicefw/devicefw.mk @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -21,5 +21,8 @@ # # IBM_PROLOG_END_TAG # common objects used in both runtime and standard hostboot envrionment -OBJS = driverif.o userif.o assoccontain.o associator.o +OBJS += driverif.o +OBJS += userif.o +OBJS += assoccontain.o +OBJS += associator.o diff --git a/src/usr/devicefw/makefile b/src/usr/devicefw/makefile index 95a4a9024..c3c9fae29 100644 --- a/src/usr/devicefw/makefile +++ b/src/usr/devicefw/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -28,6 +28,7 @@ include devicefw.mk # add objectcs unique to standard hostboot - currently none -SUBDIRS = test.d runtime.d +SUBDIRS += test.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/devicefw/runtime/makefile b/src/usr/devicefw/runtime/makefile index efe063d7b..8cc055952 100644 --- a/src/usr/devicefw/runtime/makefile +++ b/src/usr/devicefw/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -30,7 +30,7 @@ include ../devicefw.mk # add unique objects - currently none # OBJS += -SUBDIRS = test.d +SUBDIRS += test.d VPATH += .. include $(ROOTPATH)/config.mk diff --git a/src/usr/devtree/makefile b/src/usr/devtree/makefile index 8c727229a..906b522b1 100644 --- a/src/usr/devtree/makefile +++ b/src/usr/devtree/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -30,6 +30,7 @@ ROOTPATH = ../../.. MODULE = devtree -OBJS = devtree.o bld_devtree.o +OBJS += devtree.o +OBJS += bld_devtree.o include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/attn/makefile b/src/usr/diag/attn/makefile index 482913889..33ccd97a2 100644 --- a/src/usr/diag/attn/makefile +++ b/src/usr/diag/attn/makefile @@ -1,34 +1,41 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/diag/attn/makefile $ +# $Source: src/usr/diag/attn/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END_TAG +# IBM_PROLOG_END_TAG ROOTPATH = ../../../.. EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag MODULE = attn -OBJS = attntrace.o attn.o attnsvc.o attnlist.o attnbits.o attntarget.o \ - attnscom.o attnproc.o attnmem.o +OBJS += attntrace.o +OBJS += attn.o +OBJS += attnsvc.o +OBJS += attnlist.o +OBJS += attnbits.o +OBJS += attntarget.o +OBJS += attnscom.o +OBJS += attnproc.o +OBJS += attnmem.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/attn/test/makefile b/src/usr/diag/attn/test/makefile index 4159eb873..659a43dd2 100644 --- a/src/usr/diag/attn/test/makefile +++ b/src/usr/diag/attn/test/makefile @@ -1,32 +1,42 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/diag/attn/test/makefile $ +# $Source: src/usr/diag/attn/test/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END_TAG +# IBM_PROLOG_END_TAG ROOTPATH = ../../../../.. EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag -OBJS = attnfakesys.o attntest.o attnrand.o attnfakepresenter.o attnfakeprd.o \ - attnfaketarget.o attnrandsource.o attnfakegfir.o attnfakeipoll.o \ - attnvalidate.o attnfakemcs.o attnfakegp1.o attnmeminject.o +OBJS += attnfakesys.o +OBJS += attntest.o +OBJS += attnrand.o +OBJS += attnfakepresenter.o +OBJS += attnfakeprd.o +OBJS += attnfaketarget.o +OBJS += attnrandsource.o +OBJS += attnfakegfir.o +OBJS += attnfakeipoll.o +OBJS += attnvalidate.o +OBJS += attnfakemcs.o +OBJS += attnfakegp1.o +OBJS += attnmeminject.o MODULE = testattn diff --git a/src/usr/diag/makefile b/src/usr/diag/makefile index 3518d118c..b00674a74 100644 --- a/src/usr/diag/makefile +++ b/src/usr/diag/makefile @@ -1,27 +1,29 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/diag/makefile $ +# $Source: src/usr/diag/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. -SUBDIRS = mdia.d prdf.d attn.d +SUBDIRS += mdia.d +SUBDIRS += prdf.d +SUBDIRS += attn.d include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/mdia/makefile b/src/usr/diag/mdia/makefile index 1dd5ee36f..98133a780 100644 --- a/src/usr/diag/mdia/makefile +++ b/src/usr/diag/mdia/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -37,8 +37,13 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp MODULE = mdia -OBJS = mdiamonitor.o mdiatrace.o mdiaworkitem.o mdiamba.o mdia.o mdiasm.o +OBJS += mdiamonitor.o +OBJS += mdiatrace.o +OBJS += mdiaworkitem.o +OBJS += mdiamba.o +OBJS += mdia.o +OBJS += mdiasm.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/mdia/test/makefile b/src/usr/diag/mdia/test/makefile index 573666556..3421ec4b4 100644 --- a/src/usr/diag/mdia/test/makefile +++ b/src/usr/diag/mdia/test/makefile @@ -1,25 +1,25 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/diag/mdia/test/makefile $ +# $Source: src/usr/diag/mdia/test/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END_TAG +# IBM_PROLOG_END_TAG ROOTPATH = ../../../../.. EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag @@ -36,7 +36,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp ########################################################## EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp -OBJS = mdiafakesm.o mdiafakecm.o +OBJS += mdiafakesm.o +OBJS += mdiafakecm.o MODULE = testmdia diff --git a/src/usr/diag/prdf/common/framework/rule/tables.mk b/src/usr/diag/prdf/common/framework/rule/tables.mk index 738631c72..323bdcbc5 100755 --- a/src/usr/diag/prdf/common/framework/rule/tables.mk +++ b/src/usr/diag/prdf/common/framework/rule/tables.mk @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2005,2013 +# COPYRIGHT International Business Machines Corp. 2005,2014 # # p1 # @@ -28,12 +28,11 @@ # Add Rule tables here: # FIXME: This is now a duplicate of PRDR_RULE_TABLE_TARGETS in prd_ruletable.mk -PRDR_RULE_TABLES = \ - Proc.prf \ - Ex.prf \ - Mcs.prf \ - Membuf.prf \ - Mba.prf +PRDR_RULE_TABLES += Proc.prf +PRDR_RULE_TABLES += Ex.prf +PRDR_RULE_TABLES += Mcs.prf +PRDR_RULE_TABLES += Membuf.prf +PRDR_RULE_TABLES += Mba.prf #------------------------------------------------------------------ # Change nothing below this line unless you know what you're doing! diff --git a/src/usr/diag/prdf/common/plugins/plugins.mk b/src/usr/diag/prdf/common/plugins/plugins.mk index 28d91752a..27e7efddb 100644 --- a/src/usr/diag/prdf/common/plugins/plugins.mk +++ b/src/usr/diag/prdf/common/plugins/plugins.mk @@ -29,12 +29,11 @@ PLUGIN_NAME = lib${BASE_LIB_NAME} RULE_LIBRARY_NAME = ${BASE_LIB_NAME}-rule PRDR_ERRL_LIB = lib${RULE_LIBRARY_NAME} -LIBRARY_OFILES += \ - prdfLogParse.o \ - prdfLogParse_common.o \ - prdfCenLogParse.o \ - prdrErrlPluginsSupt.o \ - prdfParserUtils.o +LIBRARY_OFILES += prdfLogParse.o +LIBRARY_OFILES += prdfLogParse_common.o +LIBRARY_OFILES += prdfCenLogParse.o +LIBRARY_OFILES += prdrErrlPluginsSupt.o +LIBRARY_OFILES += prdfParserUtils.o LIBFLAGS = -Efips/lib diff --git a/src/usr/diag/prdf/common/prd_framework.mk b/src/usr/diag/prdf/common/prd_framework.mk index 005016ec6..0a5010e09 100755 --- a/src/usr/diag/prdf/common/prd_framework.mk +++ b/src/usr/diag/prdf/common/prd_framework.mk @@ -25,78 +25,71 @@ # PRD object files (common Hostboot and FSP). ################################################################################ -prd_framework = \ - iipTemplates.o \ - prdfTrace.o \ - prdfMain_common.o prdfMain.o +prd_framework += iipTemplates.o +prd_framework += prdfTrace.o +prd_framework += prdfMain_common.o +prd_framework += prdfMain.o -prd_util = \ - prdfBitString.o \ - prdfBitKey.o \ - iipdgtb.o \ - iipdigit.o \ - prdfErrlSmartPtr.o \ - prdfFilters.o \ - prdfAssert.o +prd_util += prdfBitString.o +prd_util += prdfBitKey.o +prd_util += iipdgtb.o +prd_util += iipdigit.o +prd_util += prdfErrlSmartPtr.o +prd_util += prdfFilters.o +prd_util += prdfAssert.o -prd_config = \ - iipchip.o \ - iipConfigurator.o \ - iipDomain.o \ - iipDomainContainer.o \ - prdfFabricDomain.o \ - prdfParentDomain.o \ - prdfRuleChipDomain.o \ - prdfPllDomain.o \ - iipSystem.o \ - prdfExtensibleDomain.o \ +prd_config += iipchip.o +prd_config += iipConfigurator.o +prd_config += iipDomain.o +prd_config += iipDomainContainer.o +prd_config += prdfFabricDomain.o +prd_config += prdfParentDomain.o +prd_config += prdfRuleChipDomain.o +prd_config += prdfPllDomain.o +prd_config += iipSystem.o +prd_config += prdfExtensibleDomain.o -prd_service = \ - prdfServiceDataCollector.o \ - prdfRasServices_common.o \ - prdfTargetServices.o \ - xspprdsdbug.o +prd_service += prdfServiceDataCollector.o +prd_service += prdfRasServices_common.o +prd_service += prdfTargetServices.o +prd_service += xspprdsdbug.o -prd_resolution = \ - iipResolution.o \ - iipResolutionFactory.o \ - prdfResolutionMap.o \ - prdfThresholdResolutions.o \ - xspprdFlagResolution.o \ - xspprdGardResolution.o \ - prdfClockResolution.o \ - prdfCaptureResolution.o \ - prdfDumpResolution.o +prd_resolution += iipResolution.o +prd_resolution += iipResolutionFactory.o +prd_resolution += prdfResolutionMap.o +prd_resolution += prdfThresholdResolutions.o +prd_resolution += xspprdFlagResolution.o +prd_resolution += xspprdGardResolution.o +prd_resolution += prdfClockResolution.o +prd_resolution += prdfCaptureResolution.o +prd_resolution += prdfDumpResolution.o -prd_register = \ - iipscr.o \ - prdfErrorRegister.o \ - prdfErrorRegisterMask.o \ - prdfRegisterCache.o \ - prdfResetErrorRegister.o \ - prdfScomRegister.o \ - prdfScomRegisterAccess.o \ - prdfCaptureData.o \ - prdfScanFacility.o +prd_register += iipscr.o +prd_register += prdfErrorRegister.o +prd_register += prdfErrorRegisterMask.o +prd_register += prdfRegisterCache.o +prd_register += prdfResetErrorRegister.o +prd_register += prdfScomRegister.o +prd_register += prdfScomRegisterAccess.o +prd_register += prdfCaptureData.o +prd_register += prdfScanFacility.o -prd_mnfgtools = \ - prdfMfgThresholdFile_common.o \ - prdfMfgThresholdMgr.o +prd_mnfgtools += prdfMfgThresholdFile_common.o +prd_mnfgtools += prdfMfgThresholdMgr.o -prd_object_files = \ - ${prd_framework} \ - ${prd_util} \ - ${prd_config} \ - ${prd_service} \ - ${prd_resolution} \ - ${prd_register} \ - ${prd_mnfgtools} \ +prd_object_files += ${prd_framework} +prd_object_files += ${prd_util} +prd_object_files += ${prd_config} +prd_object_files += ${prd_service} +prd_object_files += ${prd_resolution} +prd_object_files += ${prd_register} +prd_object_files += ${prd_mnfgtools} ################################################################################ # PRD object files common to Hostboot and FSP, but not to PRD simulator. ################################################################################ -prd_object_files_no_sim = \ - prdfHomRegisterAccess.o \ - prdfPlatServices_common.o prdfPlatServices.o +prd_object_files_no_sim += prdfHomRegisterAccess.o +prd_object_files_no_sim += prdfPlatServices_common.o +prd_object_files_no_sim += prdfPlatServices.o diff --git a/src/usr/diag/prdf/common/prd_pegasus.mk b/src/usr/diag/prdf/common/prd_pegasus.mk index 1d13c05ab..cf7399994 100755 --- a/src/usr/diag/prdf/common/prd_pegasus.mk +++ b/src/usr/diag/prdf/common/prd_pegasus.mk @@ -22,41 +22,38 @@ # IBM_PROLOG_END_TAG # Object files for prdf rule plugins for pegasus -PRDF_RULE_PLUGINS_PEGASUS = \ - prdfP8Proc.o \ - prdfPlatP8Ex.o \ - prdfP8Ex.o \ - prdfP8Mcs.o \ - prdfP8Pll.o \ - prdfCenMba.o \ - prdfPlatCenMba.o \ - prdfCenMembuf.o \ - prdfP8TodPlugins.o \ - prdfCenPll.o \ - prdfPlatP8Proc.o +PRDF_RULE_PLUGINS_PEGASUS += prdfP8Proc.o +PRDF_RULE_PLUGINS_PEGASUS += prdfPlatP8Ex.o +PRDF_RULE_PLUGINS_PEGASUS += prdfP8Ex.o +PRDF_RULE_PLUGINS_PEGASUS += prdfP8Mcs.o +PRDF_RULE_PLUGINS_PEGASUS += prdfP8Pll.o +PRDF_RULE_PLUGINS_PEGASUS += prdfCenMba.o +PRDF_RULE_PLUGINS_PEGASUS += prdfPlatCenMba.o +PRDF_RULE_PLUGINS_PEGASUS += prdfCenMembuf.o +PRDF_RULE_PLUGINS_PEGASUS += prdfP8TodPlugins.o +PRDF_RULE_PLUGINS_PEGASUS += prdfCenPll.o +PRDF_RULE_PLUGINS_PEGASUS += prdfPlatP8Proc.o # Object files for PRDF rule plugins, but include sim extensions. -PRDF_RULE_PLUGINS_PEGASUS_WSIM = \ - prdfP8SystemSpecific.o +PRDF_RULE_PLUGINS_PEGASUS_WSIM += prdfP8SystemSpecific.o # PEGASUS specific objects, not rule related. -prd_pegasus_specific = \ - prdfCalloutUtil.o \ - prdfPhbUtils.o \ - prdfCenAddress.o \ - prdfCenDqBitmap.o \ - prdfCenMbaCaptureData.o \ - prdfCenMbaCeTable.o \ - prdfCenMbaRceTable.o \ - prdfCenMbaTdCtlr.o \ - prdfCenMbaTdCtlr_common.o \ - prdfCenMbaThresholds_common.o \ - prdfCenMbaUeTable.o \ - prdfCenMemUtils.o \ - prdfCenSymbol.o \ - prdfLaneRepair.o \ - prdfLineDelete.o \ - prdfMemoryMru.o \ - prdfPegasusConfigurator.o \ - prdfRegisterData.o \ - prdfParserUtils.o +prd_pegasus_specific += prdfCalloutUtil.o +prd_pegasus_specific += prdfPhbUtils.o +prd_pegasus_specific += prdfCenAddress.o +prd_pegasus_specific += prdfCenDqBitmap.o +prd_pegasus_specific += prdfCenMbaCaptureData.o +prd_pegasus_specific += prdfCenMbaCeTable.o +prd_pegasus_specific += prdfCenMbaRceTable.o +prd_pegasus_specific += prdfCenMbaTdCtlr.o +prd_pegasus_specific += prdfCenMbaTdCtlr_common.o +prd_pegasus_specific += prdfCenMbaThresholds_common.o +prd_pegasus_specific += prdfCenMbaUeTable.o +prd_pegasus_specific += prdfCenMemUtils.o +prd_pegasus_specific += prdfCenSymbol.o +prd_pegasus_specific += prdfLaneRepair.o +prd_pegasus_specific += prdfLineDelete.o +prd_pegasus_specific += prdfMemoryMru.o +prd_pegasus_specific += prdfPegasusConfigurator.o +prd_pegasus_specific += prdfRegisterData.o +prd_pegasus_specific += prdfParserUtils.o diff --git a/src/usr/diag/prdf/common/prd_ruletable.mk b/src/usr/diag/prdf/common/prd_ruletable.mk index d0b73f539..030b9bfd3 100755 --- a/src/usr/diag/prdf/common/prd_ruletable.mk +++ b/src/usr/diag/prdf/common/prd_ruletable.mk @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2005,2013 +# COPYRIGHT International Business Machines Corp. 2005,2014 # # p1 # @@ -21,21 +21,19 @@ # # IBM_PROLOG_END_TAG -PRDR_RULE_TABLE_FILES = \ - Proc.rule \ - Ex.rule \ - Mcs.rule \ - Membuf.rule \ - Mba.rule +PRDR_RULE_TABLE_FILES += Proc.rule +PRDR_RULE_TABLE_FILES += Ex.rule +PRDR_RULE_TABLE_FILES += Mcs.rule +PRDR_RULE_TABLE_FILES += Membuf.rule +PRDR_RULE_TABLE_FILES += Mba.rule PRDR_RULE_TABLE_TARGETS = ${PRDR_RULE_TABLE_FILES:.rule=.prf} -prd_ruletable = \ - prdrLoadChip.o \ - prdrLoadChipCache.o \ - prdfRuleMetaData.o \ - prdfRuleChip.o \ - prdfGroup.o \ - prdfPluginMap.o \ - prdfRuleFiles.o +prd_ruletable += prdrLoadChip.o +prd_ruletable += prdrLoadChipCache.o +prd_ruletable += prdfRuleMetaData.o +prd_ruletable += prdfRuleChip.o +prd_ruletable += prdfGroup.o +prd_ruletable += prdfPluginMap.o +prd_ruletable += prdfRuleFiles.o diff --git a/src/usr/diag/prdf/framework/makefile b/src/usr/diag/prdf/framework/makefile index b9eebaea2..b3761c015 100755 --- a/src/usr/diag/prdf/framework/makefile +++ b/src/usr/diag/prdf/framework/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -23,7 +23,7 @@ ROOTPATH = ../../../../.. -SUBDIRS = rule.d +SUBDIRS += rule.d include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile index 3aa4efaaa..48d70f67c 100755 --- a/src/usr/diag/prdf/framework/rule/makefile +++ b/src/usr/diag/prdf/framework/rule/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -82,42 +82,44 @@ REG_PLUGIN_PATHS = $(addprefix ${OBJ_PLUG_DIR}/, ${REG_PLUGIN_TARGETS}) #------------------------------------------------------------------------------- # Entire directories to link. -SOURCE_PLUGIN_DIRS = \ - ${SRC_USR}/common/plugins \ - ${SRC_USR}/plugins +SOURCE_PLUGIN_DIRS += ${SRC_USR}/common/plugins +SOURCE_PLUGIN_DIRS += ${SRC_USR}/plugins # Individual source files to link. -SOURCE_PLUGIN_FILES = \ - ${SRC_USR}/common/framework/rule/tables.mk \ - ${SRC_USR}/common/util/UtilHash.H \ - ${SRC_USR}/common/plat/pegasus/prdfCenConst.H \ - ${SRC_USR}/common/iipconst.h \ - ${SRC_USR}/common/prdf_types.h \ - ${SRC_INC}/common/prdf_service_codes.H \ - $(foreach d, ${SOURCE_PLUGIN_DIRS}, \ - $(addprefix $(d)/, $(notdir $(wildcard ${ROOTPATH}/$(d)/*)))) - -LINK_PLUGIN_FILES = \ - $(addprefix ${OBJ_PLUG_DIR}/,$(notdir ${SOURCE_PLUGIN_FILES})) +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/framework/rule/tables.mk +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/util/UtilHash.H +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/plat/pegasus/prdfCenConst.H +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/iipconst.h +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/prdf_types.h +SOURCE_PLUGIN_FILES += ${SRC_INC}/common/prdf_service_codes.H +SOURCE_PLUGIN_FILES += $(foreach d, ${SOURCE_PLUGIN_DIRS}, $(addprefix $(d)/, $(notdir $(wildcard ${ROOTPATH}/$(d)/*)))) + +LINK_PLUGIN_FILES += $(addprefix ${OBJ_PLUG_DIR}/,$(notdir ${SOURCE_PLUGIN_FILES})) #------------------------------------------------------------------------------- # CODE_PASS #------------------------------------------------------------------------------- -CODE_PASS_BODY += \ - ${PRF_IMG_PATHS} ${ERR_PLUGIN_PATHS} ${REG_PLUGIN_PATHS} \ - ${LINK_PLUGIN_FILES} - -CLEAN_TARGETS += \ - ${PRDR_CMP_PATH} ${PRDR_CMP_o_PATH} \ - ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_YACC_C_PATH} \ - ${PRDR_CMP_YACC_H_PATH} ${PRDR_CMP_FLEX_o_PATH} ${PRDR_CMP_FLEX_C_PATH} \ - $(addprefix ${OBJ_RULE_DIR}/, ${PRDR_RULE_TABLE_TARGETS}) \ - $(addprefix ${OBJ_RULE_DIR}/, ${ERR_PLUGIN_TARGETS}) \ - $(addprefix ${OBJ_RULE_DIR}/, ${REG_PLUGIN_TARGETS}) \ - $(addprefix ${OBJ_RULE_DIR}/, ${HTML_PLUGIN_TARGETS}) \ - ${PRF_IMG_PATHS} ${ERR_PLUGIN_PATHS} ${REG_PLUGIN_PATHS} \ - ${LINK_PLUGIN_FILES} +CODE_PASS_BODY += ${PRF_IMG_PATHS} +CODE_PASS_BODY += ${ERR_PLUGIN_PATHS} +CODE_PASS_BODY += ${REG_PLUGIN_PATHS} +CODE_PASS_BODY += ${LINK_PLUGIN_FILES} + +CLEAN_TARGETS += ${PRDR_CMP_PATH} +CLEAN_TARGETS += ${PRDR_CMP_o_PATH} +CLEAN_TARGETS += ${PRDR_CMP_YACC_o_PATH} +CLEAN_TARGETS += ${PRDR_CMP_YACC_C_PATH} +CLEAN_TARGETS += ${PRDR_CMP_YACC_H_PATH} +CLEAN_TARGETS += ${PRDR_CMP_FLEX_o_PATH} +CLEAN_TARGETS += ${PRDR_CMP_FLEX_C_PATH} +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${PRDR_RULE_TABLE_TARGETS}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${ERR_PLUGIN_TARGETS}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${REG_PLUGIN_TARGETS}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${HTML_PLUGIN_TARGETS}) +CLEAN_TARGETS += ${PRF_IMG_PATHS} +CLEAN_TARGETS += ${ERR_PLUGIN_PATHS} +CLEAN_TARGETS += ${REG_PLUGIN_PATHS} +CLEAN_TARGETS += ${LINK_PLUGIN_FILES} # NOTE: All rules defined in this makefile must be done after this line # otherwise the default rule 'all' will not be called. diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile index 9d24869ad..2e28d41bb 100755 --- a/src/usr/diag/prdf/makefile +++ b/src/usr/diag/prdf/makefile @@ -33,27 +33,26 @@ MODULE = prdf #------------------------------------------------------------------------------ PRD_USR_PATH = ${ROOTPATH}/src/usr/diag/prdf -VPATH = \ - common \ - common/util \ - common/plat \ - common/plat/pegasus \ - common/framework \ - common/framework/resolution \ - common/framework/register \ - common/framework/service \ - common/framework/config \ - common/framework/rule \ - common/mnfgtools \ - mnfgtools \ - framework \ - framework/config \ - framework/rule \ - framework/service \ - framework/resolution \ - plat \ - plat/pegasus \ - common/plugins +VPATH += common +VPATH += common/util +VPATH += common/plat +VPATH += common/plat/pegasus +VPATH += common/framework +VPATH += common/framework/resolution +VPATH += common/framework/register +VPATH += common/framework/service +VPATH += common/framework/config +VPATH += common/framework/rule +VPATH += common/mnfgtools +VPATH += mnfgtools +VPATH += framework +VPATH += framework/config +VPATH += framework/rule +VPATH += framework/service +VPATH += framework/resolution +VPATH += plat +VPATH += plat/pegasus +VPATH += common/plugins #FIXME: we can remove most of these as well if we have them include correctly EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi @@ -100,15 +99,14 @@ include common/prd_ruletable.mk include common/prd_pegasus.mk include prdf_hb_only.mk -OBJS = \ - ${prd_object_files} \ - ${prd_object_files_no_sim} \ - ${prd_ruletable} \ - ${prd_pegasus_specific} \ - ${prd_object_files_HB} \ - ${PRDF_RULE_PLUGINS_PEGASUS} \ - ${PRDF_RULE_PLUGINS_PEGASUS_HB} \ - ${PRDF_RULE_PLUGINS_PEGASUS_WSIM} \ +OBJS += ${prd_object_files} +OBJS += ${prd_object_files_no_sim} +OBJS += ${prd_ruletable} +OBJS += ${prd_pegasus_specific} +OBJS += ${prd_object_files_HB} +OBJS += ${PRDF_RULE_PLUGINS_PEGASUS} +OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_HB} +OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_WSIM} #------------------------------------------------------------------------------ # Generated Mfg Threshold Header file diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk index af7ef5221..bf722261c 100644 --- a/src/usr/diag/prdf/prdf_hb_only.mk +++ b/src/usr/diag/prdf/prdf_hb_only.mk @@ -32,20 +32,16 @@ PRDF_RULE_PLUGINS_PEGASUS_HB = \ # PRD object files (Hostboot only). ################################################################################ -prd_config_HB = \ - prdfMbaDomain.o \ +prd_config_HB += prdfMbaDomain.o -prd_mnfgtools_HB = \ - prdfMfgThresholdFile.o \ - prdfMfgSync.o +prd_mnfgtools_HB += prdfMfgThresholdFile.o +prd_mnfgtools_HB += prdfMfgSync.o -prd_plat_HB = \ - prdfCenMbaIplCeStats.o \ - prdfDramRepairs.o \ - prdfRasServices.o \ - prdfPlatCalloutUtil.o +prd_plat_HB += prdfCenMbaIplCeStats.o +prd_plat_HB += prdfDramRepairs.o +prd_plat_HB += prdfRasServices.o +prd_plat_HB += prdfPlatCalloutUtil.o -prd_object_files_HB = \ - ${prd_config_HB} \ - ${prd_mnfgtools_HB} \ - ${prd_plat_HB} +prd_object_files_HB += ${prd_config_HB} +prd_object_files_HB += ${prd_mnfgtools_HB} +prd_object_files_HB += ${prd_plat_HB} diff --git a/src/usr/diag/prdf/test/makefile b/src/usr/diag/prdf/test/makefile index 03de64d58..e0170033c 100755 --- a/src/usr/diag/prdf/test/makefile +++ b/src/usr/diag/prdf/test/makefile @@ -59,29 +59,29 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp # objects #------------------------------------------------------------------------------ -OBJS = prdfsimHomRegisterAccess.o \ - prdfsimRasServices.o \ - prdfsimScrDataSet.o \ - prdfsimScrDB.o \ - prdfsimServices.o \ - prdsimSignatureParser.o \ - prdfsimUtil.o \ - prdfsimMfgSync.o \ - prdfsimFspSyncSvc.o \ - prdfsimFspMfgThresholdFile.o +OBJS += prdfsimHomRegisterAccess.o +OBJS += prdfsimRasServices.o +OBJS += prdfsimScrDataSet.o +OBJS += prdfsimScrDB.o +OBJS += prdfsimServices.o +OBJS += prdsimSignatureParser.o +OBJS += prdfsimUtil.o +OBJS += prdfsimMfgSync.o +OBJS += prdfsimFspSyncSvc.o +OBJS += prdfsimFspMfgThresholdFile.o -TESTS = prdfTest_MfgSync.H \ - prdfTest_ABus.H \ - prdfTest_Ex.H \ - prdfTest.H \ - prdfTest_Mba.H \ - prdfTest_Mcs.H \ - prdfTest_Proc.H \ - prdfTest_XBus.H \ - prdfTest_McsMciFir.H \ - prdfTest_ProcCentFir.H \ - prdfTest_ProcMbsFir.H \ - prdfTest_ProcTpLFir.H \ - prdfTest_CentCs.H +TESTS += prdfTest_MfgSync.H +TESTS += prdfTest_ABus.H +TESTS += prdfTest_Ex.H +TESTS += prdfTest.H +TESTS += prdfTest_Mba.H +TESTS += prdfTest_Mcs.H +TESTS += prdfTest_Proc.H +TESTS += prdfTest_XBus.H +TESTS += prdfTest_McsMciFir.H +TESTS += prdfTest_ProcCentFir.H +TESTS += prdfTest_ProcMbsFir.H +TESTS += prdfTest_ProcTpLFir.H +TESTS += prdfTest_CentCs.H include ${ROOTPATH}/config.mk diff --git a/src/usr/dump/makefile b/src/usr/dump/makefile index bc44d3a92..f608a3f0a 100644 --- a/src/usr/dump/makefile +++ b/src/usr/dump/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -23,8 +23,8 @@ ROOTPATH = ../../.. MODULE = dump -OBJS = dumpCollect.o +OBJS += dumpCollect.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/ecmddatabuffer/makefile b/src/usr/ecmddatabuffer/makefile index 97d6b46ae..bdf91a6f7 100644 --- a/src/usr/ecmddatabuffer/makefile +++ b/src/usr/ecmddatabuffer/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -30,8 +30,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer CFLAGS += -DPRDF_COMPRESSBUFFER_COMPRESS_FUNCTIONS=1 CFLAGS += -DPRDF_COMPRESSBUFFER_UNCOMPRESS_FUNCTIONS=1 -OBJS = ecmdDataBufferBase.o +OBJS += ecmdDataBufferBase.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/errl/makefile b/src/usr/errl/makefile index cfeb85dc2..dcf6be60d 100644 --- a/src/usr/errl/makefile +++ b/src/usr/errl/makefile @@ -23,12 +23,27 @@ ROOTPATH = ../../.. MODULE = errl -OBJS = errlentry.o errlmanager.o errlsctn.o errlsctnhdr.o errlprvt.o errluh.o \ - errlud.o errlsrc.o errluserdetails.o backtrace.o errludtarget.o \ - errludstring.o errludbacktrace.o errludattribute.o errludlogregister.o \ - errludcallout.o errludprintk.o +OBJS += errlentry.o +OBJS += errlmanager.o +OBJS += errlsctn.o +OBJS += errlsctnhdr.o +OBJS += errlprvt.o +OBJS += errluh.o +OBJS += errlud.o +OBJS += errlsrc.o +OBJS += errluserdetails.o +OBJS += backtrace.o +OBJS += errludtarget.o +OBJS += errludstring.o +OBJS += errludbacktrace.o +OBJS += errludattribute.o +OBJS += errludlogregister.o +OBJS += errludcallout.o +OBJS += errludprintk.o -SUBDIRS = test.d parser.d runtime.d +SUBDIRS += test.d +SUBDIRS += parser.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/errl/runtime/makefile b/src/usr/errl/runtime/makefile index 618fdd87a..cc8966d11 100644 --- a/src/usr/errl/runtime/makefile +++ b/src/usr/errl/runtime/makefile @@ -24,12 +24,25 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = errl_rt -OBJS = errlentry.o rt_errlmanager.o errlsctn.o errlsctnhdr.o errlprvt.o errluh.o \ - errlud.o errlsrc.o errluserdetails.o backtrace.o errludtarget.o \ - errludstring.o errludbacktrace.o errludattribute.o \ - errludcallout.o rt_vfs.o errludlogregister.o +OBJS += errlentry.o +OBJS += rt_errlmanager.o +OBJS += errlsctn.o +OBJS += errlsctnhdr.o +OBJS += errlprvt.o +OBJS += errluh.o +OBJS += errlud.o +OBJS += errlsrc.o +OBJS += errluserdetails.o +OBJS += backtrace.o +OBJS += errludtarget.o +OBJS += errludstring.o +OBJS += errludbacktrace.o +OBJS += errludattribute.o +OBJS += errludcallout.o +OBJS += rt_vfs.o +OBJS += errludlogregister.o -SUBDIRS = test.d +SUBDIRS += test.d VPATH += .. include $(ROOTPATH)/config.mk diff --git a/src/usr/fsi/makefile b/src/usr/fsi/makefile index fb725654d..5aa651a16 100644 --- a/src/usr/fsi/makefile +++ b/src/usr/fsi/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -23,8 +23,10 @@ ROOTPATH = ../../.. MODULE = fsi -OBJS = fsidd.o fsipres.o errlud_fsi.o +OBJS += fsidd.o +OBJS += fsipres.o +OBJS += errlud_fsi.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/fsiscom/makefile b/src/usr/fsiscom/makefile index 56402b30f..d883be479 100644 --- a/src/usr/fsiscom/makefile +++ b/src/usr/fsiscom/makefile @@ -1,30 +1,30 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/fsiscom/makefile $ +# $Source: src/usr/fsiscom/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. MODULE = fsiscom -OBJS = fsiscom.o +OBJS += fsiscom.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/hwas/makefile b/src/usr/hwas/makefile index b66dec03d..86a59e347 100644 --- a/src/usr/hwas/makefile +++ b/src/usr/hwas/makefile @@ -42,12 +42,16 @@ VPATH += ${ROOTPATH}/src/usr/hwas/common MODULE = hwas # files in hwas/common directory -OBJS = hwas.o hwasCallout.o deconfigGard.o +OBJS += hwas.o +OBJS += hwasCallout.o +OBJS += deconfigGard.o # files in this directory -OBJS += hwasPlat.o hostbootIstep.o \ - hwasPlatError.o hwasPlatCallout.o \ - hwasPlatDeconfigGard.o +OBJS += hwasPlat.o +OBJS += hostbootIstep.o +OBJS += hwasPlatError.o +OBJS += hwasPlatCallout.o +OBJS += hwasPlatDeconfigGard.o SUBDIRS = test.d diff --git a/src/usr/hwas/test/makefile b/src/usr/hwas/test/makefile index 6cc573dbe..97e5d4be2 100644 --- a/src/usr/hwas/test/makefile +++ b/src/usr/hwas/test/makefile @@ -1,25 +1,25 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/targeting/test/makefile $ +# $Source: src/usr/hwas/test/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../../.. EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi @@ -30,7 +30,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer MODULE = testhwas TESTS = *.H -OBJS = attributestrings.o +OBJS += attributestrings.o include ${ROOTPATH}/config.mk diff --git a/src/usr/hwpf/fapi/fapi.mk b/src/usr/hwpf/fapi/fapi.mk index 3be4d36cb..1e53aba95 100644 --- a/src/usr/hwpf/fapi/fapi.mk +++ b/src/usr/hwpf/fapi/fapi.mk @@ -28,12 +28,12 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include CFLAGS += -D_NO_SPY_ACCESS=1 -OBJS += fapiReturnCode.o \ - fapiReturnCodeDataRef.o \ - fapiTarget.o \ - fapiHwAccess.o \ - fapiErrorInfo.o \ - fapiAttributeService.o \ - fapiChipEcFeature.o \ - fapiCollectRegFfdc.o \ +OBJS += fapiReturnCode.o +OBJS += fapiReturnCodeDataRef.o +OBJS += fapiTarget.o +OBJS += fapiHwAccess.o +OBJS += fapiErrorInfo.o +OBJS += fapiAttributeService.o +OBJS += fapiChipEcFeature.o +OBJS += fapiCollectRegFfdc.o diff --git a/src/usr/hwpf/fapi/makefile b/src/usr/hwpf/fapi/makefile index 7cce04d0e..539e5c46d 100644 --- a/src/usr/hwpf/fapi/makefile +++ b/src/usr/hwpf/fapi/makefile @@ -23,7 +23,7 @@ ROOTPATH = ../../../.. MODULE = fapi -SUBDIRS = runtime.d +SUBDIRS += runtime.d include fapi.mk 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 diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index f9f0083dc..ca64f5900 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -30,226 +30,226 @@ SUBDIRS = fapi.d hwp.d plat.d test.d #------------------------------------------------------------------------------ # Source XML files #------------------------------------------------------------------------------ -HWP_ERROR_XML_FILES = hwp/fapiHwpErrorInfo.xml \ - hwp/dmi_training/proc_cen_framelock/proc_cen_framelock_errors.xml \ - hwp/dimm_errors.xml \ - hwp/chip_accessors/chip_errors.xml \ - hwp/dram_training/memory_errors.xml \ - hwp/nest_chiplets/proc_start_clocks_chiplets/proc_start_clocks_chiplets_errors.xml \ - hwp/edi_ei_initialization/proc_fab_iovalid/proc_fab_smp_errors.xml \ - hwp/mvpd_accessors/mvpd_errors.xml \ - hwp/spd_accessors/getSpdAttrAccessorErrors.xml \ - hwp/winkle_ring_accessors/proc_l3_delta_data_errors.xml \ - hwp/pll_accessors/getPllRingInfoAttrErrors.xml \ - hwp/pll_accessors/getPllRingAttrErrors.xml \ - ../pore/fapiporeve/fapiPoreVe_errors.xml \ - hwp/dram_initialization/proc_setup_bars/proc_setup_bars_errors.xml \ - hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml \ - hwp/build_winkle_images/p8_slw_build/p8_slw_build_errors.xml \ - hwp/build_winkle_images/p8_slw_build/p8_xip_customize_errors.xml \ - hwp/build_winkle_images/p8_slw_build/p8_pba_bar_config_errors.xml \ - hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml \ - hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml \ - hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer_errors.xml \ - hwp/activate_powerbus/proc_build_smp/proc_build_smp_errors.xml \ - hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml \ - hwp/thread_activate/proc_thread_control/proc_thread_control.xml \ - hwp/bus_training/erepair_errors.xml \ - hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_errors.xml \ - hwp/dram_initialization/proc_pcie_config/proc_pcie_config_errors.xml \ - hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml \ - hwp/build_winkle_images/p8_set_pore_bar/p8_pmc_deconfig_setup_errors.xml \ - hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_errors.xml \ - hwp/build_winkle_images/p8_set_pore_bar/p8_poreslw_errors.xml \ - hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_check_slave_sbe_seeprom_complete_errors.xml \ - hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml \ - hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_read_seeprom_errors.xml \ - hwp/proc_sbe_registers.xml \ - hwp/runtime_errors/p8_ocb_init_errors.xml \ - hwp/runtime_errors/p8_occ_control_errors.xml \ - hwp/runtime_errors/p8_occ_sram_init_errors.xml \ - hwp/runtime_errors/p8_oha_init_errors.xml \ - hwp/runtime_errors/p8_pcbs_init_errors.xml \ - hwp/runtime_errors/p8_pm_prep_for_reset_errors.xml \ - hwp/runtime_errors/p8_force_vsafe_errors.xml \ - hwp/runtime_errors/p8_pmc_errors.xml \ - hwp/runtime_errors/p8_pss_errors.xml \ - hwp/runtime_errors/proc_cpu_special_wakeup_errors.xml \ - hwp/runtime_errors/p8_poregpe_errors.xml \ - hwp/runtime_errors/p8_pba_init_errors.xml \ - hwp/runtime_errors/proc_ocb_indir_access_errors.xml \ - hwp/dram_initialization/host_mpipl_service/proc_mpipl_chip_cleanup_errors.xml \ - hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_init_errors.xml \ - hwp/poreve_errors.xml \ - hwp/proc_fab_iovalid_errors.xml \ - hwp/nest_chiplets/proc_chiplet_scominit/proc_abus_scominit_errors.xml \ - hwp/nest_chiplets/proc_chiplet_scominit/proc_xbus_scominit_errors.xml \ - hwp/dmi_training/proc_dmi_scominit_errors.xml \ - hwp/dmi_training/cen_dmi_scominit_errors.xml \ - hwp/sbe_centaur_init/cen_xip_customize_errors.xml \ - hwp/tod_init/proc_tod_utils/proc_tod_utils.xml \ - hwp/mc_config/mss_eff_config/opt_memmap_errors.xml \ - hwp/pstates/pstates/p8_build_pstate_datablock_errors.xml \ - hwp/pstates/pstates/proc_get_voltage_errors.xml \ - hwp/proc_cfam_registers.xml \ - hwp/p8_slw_registers.xml \ - hwp/utility_procedures/memory_mss_maint_cmds.xml \ - hwp/mc_config/mss_volt/memory_mss_volt.xml \ - hwp/mc_config/mss_freq/memory_mss_freq.xml \ - hwp/mc_config/mss_eff_config/memory_mss_eff_grouping.xml \ - hwp/mc_config/mss_eff_config/memory_mss_eff_config_thermal.xml \ - hwp/mc_config/mss_eff_config/memory_mss_bulk_pwr_throttles.xml \ - hwp/dram_training/memory_mss_funcs.xml \ - hwp/dram_training/mss_draminit_training/memory_mss_draminit_training.xml \ - hwp/dram_training/mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml \ - hwp/dram_training/memory_mss_termination_control.xml \ - hwp/dram_training/mem_startclocks/memory_cen_stopclocks.xml \ - hwp/dram_training/mss_scominit/memory_mss_scominit.xml \ - hwp/dram_training/mss_draminit_trainadv/memory_mss_mcbist_common.xml \ - hwp/dram_initialization/proc_setup_bars/memory_mss_setup_bars.xml \ - hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable_errors.xml \ - hwp/dmi_training/mss_getecid/memory_mss_get_cen_ecid.xml \ - hwp/dram_initialization/mss_extent_setup/memory_mss_extent_setup.xml \ - hwp/dram_initialization/mss_thermal_init/memory_mss_thermal_init.xml \ - hwp/dram_training/mss_draminit/memory_mss_draminit.xml \ - hwp/dram_training/mss_draminit_mc/memory_mss_draminit_mc.xml \ - hwp/dram_training/mss_draminit_trainadv/memory_mss_access_delay_reg.xml \ - hwp/dram_training/mss_draminit_trainadv/memory_mss_draminit_training_advanced.xml \ - hwp/dram_training/mss_draminit_trainadv/memory_mss_generic_shmoo.xml \ - hwp/dram_training/mss_draminit_trainadv/memory_mss_mcbist.xml \ - hwp/mc_config/mss_eff_config/memory_mss_eff_config.xml \ - hwp/mc_config/mss_eff_config/memory_mss_eff_config_cke_map.xml \ - hwp/mc_config/mss_eff_config/memory_mss_eff_config_rank_group.xml \ - hwp/mc_config/mss_eff_config/memory_mss_eff_config_termination.xml \ - hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml \ - hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml \ - hwp/proc_otprom_registers.xml \ - hwp/runtime_errors/p8_gpe_registers.xml \ - hwp/runtime_errors/p8_pss_registers.xml \ - hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml \ - hwp/dram_training/mem_startclocks/cen_mem_startclocks_errors.xml \ - hwp/dram_training/mem_pll_setup/cen_mem_pll_initf_errors.xml \ - hwp/dram_training/mem_pll_setup/cen_mem_pll_setup_errors.xml \ - hwp/core_activate/proc_check_slw_done/proc_check_slw_done_errors.xml \ - hwp/dram_initialization/proc_throttle_sync/proc_throttle_sync_errors.xml \ - hwp/dram_initialization/mss_power_cleanup/memory_mss_power_cleanup.xml \ - hwp/runtime_errors/p8_pstate_registers.xml \ - hwp/mc_config/mss_eff_mb_interleave/memory_mss_eff_mb_interleave.xml \ - hwp/nest_chiplets/proc_a_x_pci_dmi_pll_registers.xml \ - hwp/dram_training/mss_lrdimm_funcs/memory_mss_lrdimm_funcs.xml \ - hwp/bus_training/gcr_funcs_errors.xml \ - hwp/bus_training/io_run_training_errors.xml \ - hwp/bus_training/io_funcs_errors.xml \ - hwp/bus_training/io_dccal_errors.xml \ - hwp/bus_training/io_power_down_lanes_errors.xml \ - hwp/bus_training/io_read_erepair_errors.xml \ - hwp/bus_training/io_fir_isolation_errors.xml \ - hwp/bus_training/io_restore_erepair_errors.xml \ - hwp/bus_training/io_cleanup_errors.xml \ - hwp/proc_pibmem_registers.xml \ - hwp/proc_clock_control_registers.xml \ - hwp/proc_sbe_errors/proc_sbe_check_master_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_chiplet_init_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_decompress_scan_halt_codes.xml \ - hwp/proc_sbe_errors/proc_sbe_ex_dpll_setup_halt_codes.xml \ - hwp/proc_sbe_errors/proc_sbe_ex_startclocks_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_fabricinit_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_instruct_start_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_lco_loader_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_npll_setup_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_pb_startclocks.xml \ - hwp/proc_sbe_errors/proc_sbe_pibmem_loader_halt_codes.xml \ - hwp/proc_sbe_errors/proc_sbe_scominit_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_select_ex_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_setup_evid_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_tp_switch_gears_errors.xml \ - hwp/proc_sbe_errors/proc_sbe_trigger_winkle_errors.xml \ - hwp/proc_sbe_errors/proc_slw_base_halt_codes.xml \ - hwp/proc_sbe_errors/sbe_common_halt_codes.xml \ - hwp/proc_sbe_errors/sbe_load_ring_vec_ex_errors.xml +HWP_ERROR_XML_FILES += hwp/fapiHwpErrorInfo.xml +HWP_ERROR_XML_FILES += hwp/dmi_training/proc_cen_framelock/proc_cen_framelock_errors.xml +HWP_ERROR_XML_FILES += hwp/dimm_errors.xml +HWP_ERROR_XML_FILES += hwp/chip_accessors/chip_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_training/memory_errors.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_start_clocks_chiplets/proc_start_clocks_chiplets_errors.xml +HWP_ERROR_XML_FILES += hwp/edi_ei_initialization/proc_fab_iovalid/proc_fab_smp_errors.xml +HWP_ERROR_XML_FILES += hwp/mvpd_accessors/mvpd_errors.xml +HWP_ERROR_XML_FILES += hwp/spd_accessors/getSpdAttrAccessorErrors.xml +HWP_ERROR_XML_FILES += hwp/winkle_ring_accessors/proc_l3_delta_data_errors.xml +HWP_ERROR_XML_FILES += hwp/pll_accessors/getPllRingInfoAttrErrors.xml +HWP_ERROR_XML_FILES += hwp/pll_accessors/getPllRingAttrErrors.xml +HWP_ERROR_XML_FILES += ../pore/fapiporeve/fapiPoreVe_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/proc_setup_bars/proc_setup_bars_errors.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_slw_build/p8_slw_build_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_slw_build/p8_xip_customize_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_slw_build/p8_pba_bar_config_errors.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml +HWP_ERROR_XML_FILES += hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml +HWP_ERROR_XML_FILES += hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer_errors.xml +HWP_ERROR_XML_FILES += hwp/activate_powerbus/proc_build_smp/proc_build_smp_errors.xml +HWP_ERROR_XML_FILES += hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml +HWP_ERROR_XML_FILES += hwp/thread_activate/proc_thread_control/proc_thread_control.xml +HWP_ERROR_XML_FILES += hwp/bus_training/erepair_errors.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/proc_pcie_config/proc_pcie_config_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_set_pore_bar/p8_pmc_deconfig_setup_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_set_pore_bar/p8_poreslw_errors.xml +HWP_ERROR_XML_FILES += hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_check_slave_sbe_seeprom_complete_errors.xml +HWP_ERROR_XML_FILES += hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml +HWP_ERROR_XML_FILES += hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_read_seeprom_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_registers.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_ocb_init_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_occ_control_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_occ_sram_init_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_oha_init_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pcbs_init_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pm_prep_for_reset_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_force_vsafe_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pmc_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pss_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/proc_cpu_special_wakeup_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_poregpe_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pba_init_errors.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/proc_ocb_indir_access_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/host_mpipl_service/proc_mpipl_chip_cleanup_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_init_errors.xml +HWP_ERROR_XML_FILES += hwp/poreve_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_fab_iovalid_errors.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_chiplet_scominit/proc_abus_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_chiplet_scominit/proc_xbus_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/dmi_training/proc_dmi_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/dmi_training/cen_dmi_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/sbe_centaur_init/cen_xip_customize_errors.xml +HWP_ERROR_XML_FILES += hwp/tod_init/proc_tod_utils/proc_tod_utils.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/opt_memmap_errors.xml +HWP_ERROR_XML_FILES += hwp/pstates/pstates/p8_build_pstate_datablock_errors.xml +HWP_ERROR_XML_FILES += hwp/pstates/pstates/proc_get_voltage_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_cfam_registers.xml +HWP_ERROR_XML_FILES += hwp/p8_slw_registers.xml +HWP_ERROR_XML_FILES += hwp/utility_procedures/memory_mss_maint_cmds.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_volt/memory_mss_volt.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_freq/memory_mss_freq.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_eff_grouping.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_eff_config_thermal.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_bulk_pwr_throttles.xml +HWP_ERROR_XML_FILES += hwp/dram_training/memory_mss_funcs.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_training/memory_mss_draminit_training.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml +HWP_ERROR_XML_FILES += hwp/dram_training/memory_mss_termination_control.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mem_startclocks/memory_cen_stopclocks.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_scominit/memory_mss_scominit.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_trainadv/memory_mss_mcbist_common.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/proc_setup_bars/memory_mss_setup_bars.xml +HWP_ERROR_XML_FILES += hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable_errors.xml +HWP_ERROR_XML_FILES += hwp/dmi_training/mss_getecid/memory_mss_get_cen_ecid.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/mss_extent_setup/memory_mss_extent_setup.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/mss_thermal_init/memory_mss_thermal_init.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit/memory_mss_draminit.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_mc/memory_mss_draminit_mc.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_trainadv/memory_mss_access_delay_reg.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_trainadv/memory_mss_draminit_training_advanced.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_trainadv/memory_mss_generic_shmoo.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_draminit_trainadv/memory_mss_mcbist.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_eff_config.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_eff_config_cke_map.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_eff_config_rank_group.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_config/memory_mss_eff_config_termination.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml +HWP_ERROR_XML_FILES += hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_otprom_registers.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_gpe_registers.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pss_registers.xml +HWP_ERROR_XML_FILES += hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mem_startclocks/cen_mem_startclocks_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mem_pll_setup/cen_mem_pll_initf_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mem_pll_setup/cen_mem_pll_setup_errors.xml +HWP_ERROR_XML_FILES += hwp/core_activate/proc_check_slw_done/proc_check_slw_done_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/proc_throttle_sync/proc_throttle_sync_errors.xml +HWP_ERROR_XML_FILES += hwp/dram_initialization/mss_power_cleanup/memory_mss_power_cleanup.xml +HWP_ERROR_XML_FILES += hwp/runtime_errors/p8_pstate_registers.xml +HWP_ERROR_XML_FILES += hwp/mc_config/mss_eff_mb_interleave/memory_mss_eff_mb_interleave.xml +HWP_ERROR_XML_FILES += hwp/nest_chiplets/proc_a_x_pci_dmi_pll_registers.xml +HWP_ERROR_XML_FILES += hwp/dram_training/mss_lrdimm_funcs/memory_mss_lrdimm_funcs.xml +HWP_ERROR_XML_FILES += hwp/bus_training/gcr_funcs_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_run_training_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_funcs_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_dccal_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_power_down_lanes_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_read_erepair_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_fir_isolation_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_restore_erepair_errors.xml +HWP_ERROR_XML_FILES += hwp/bus_training/io_cleanup_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_pibmem_registers.xml +HWP_ERROR_XML_FILES += hwp/proc_clock_control_registers.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_check_master_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_chiplet_init_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_decompress_scan_halt_codes.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_ex_dpll_setup_halt_codes.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_ex_startclocks_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_fabricinit_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_instruct_start_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_lco_loader_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_npll_setup_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_pb_startclocks.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_pibmem_loader_halt_codes.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_scominit_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_select_ex_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_setup_evid_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_tp_switch_gears_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_sbe_trigger_winkle_errors.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/proc_slw_base_halt_codes.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/sbe_common_halt_codes.xml +HWP_ERROR_XML_FILES += hwp/proc_sbe_errors/sbe_load_ring_vec_ex_errors.xml ## these get generated into obj/genfiles/AttributeIds.H -HWP_ATTR_XML_FILES = hwp/memory_attributes.xml \ - hwp/L2_L3_attributes.xml \ - hwp/scratch_attributes.xml \ - hwp/system_attributes.xml \ - hwp/chip_attributes.xml \ - hwp/dimm_spd_attributes.xml \ - hwp/dimm_attributes.xml \ - hwp/unit_attributes.xml \ - hwp/freq_attributes.xml \ - hwp/ei_bus_attributes.xml \ - hwp/chip_ec_attributes.xml \ - hwp/centaur_ec_attributes.xml \ - hwp/common_attributes.xml \ - hwp/sync_attributes.xml \ - hwp/dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml \ - hwp/dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml \ - hwp/dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml \ - hwp/activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml \ - hwp/runtime_attributes/pm_plat_attributes.xml \ - hwp/runtime_attributes/pm_hwp_attributes.xml \ - hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml \ - hwp/dmi_training/proc_cen_set_inband_addr/proc_cen_set_inband_addr_attributes.xml \ - hwp/build_winkle_images/p8_slw_build/proc_pll_ring_attributes.xml \ - hwp/build_winkle_images/p8_slw_build/p8_xip_customize_attributes.xml \ - hwp/poreve_memory_attributes.xml \ - hwp/mcbist_attributes.xml \ - hwp/proc_winkle_scan_override_attributes.xml \ - hwp/erepair_thresholds.xml \ - hwp/dram_training/mem_pll_setup/memb_pll_ring_attributes.xml \ - hwp/proc_chip_ec_feature.xml \ - hwp/proc_abus_dmi_xbus_scominit_attributes.xml \ - hwp/runtime_attributes/memory_occ_attributes.xml +HWP_ATTR_XML_FILES += hwp/memory_attributes.xml +HWP_ATTR_XML_FILES += hwp/L2_L3_attributes.xml +HWP_ATTR_XML_FILES += hwp/scratch_attributes.xml +HWP_ATTR_XML_FILES += hwp/system_attributes.xml +HWP_ATTR_XML_FILES += hwp/chip_attributes.xml +HWP_ATTR_XML_FILES += hwp/dimm_spd_attributes.xml +HWP_ATTR_XML_FILES += hwp/dimm_attributes.xml +HWP_ATTR_XML_FILES += hwp/unit_attributes.xml +HWP_ATTR_XML_FILES += hwp/freq_attributes.xml +HWP_ATTR_XML_FILES += hwp/ei_bus_attributes.xml +HWP_ATTR_XML_FILES += hwp/chip_ec_attributes.xml +HWP_ATTR_XML_FILES += hwp/centaur_ec_attributes.xml +HWP_ATTR_XML_FILES += hwp/common_attributes.xml +HWP_ATTR_XML_FILES += hwp/sync_attributes.xml +HWP_ATTR_XML_FILES += hwp/dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml +HWP_ATTR_XML_FILES += hwp/dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml +HWP_ATTR_XML_FILES += hwp/dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml +HWP_ATTR_XML_FILES += hwp/activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml +HWP_ATTR_XML_FILES += hwp/runtime_attributes/pm_plat_attributes.xml +HWP_ATTR_XML_FILES += hwp/runtime_attributes/pm_hwp_attributes.xml +HWP_ATTR_XML_FILES += hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml +HWP_ATTR_XML_FILES += hwp/dmi_training/proc_cen_set_inband_addr/proc_cen_set_inband_addr_attributes.xml +HWP_ATTR_XML_FILES += hwp/build_winkle_images/p8_slw_build/proc_pll_ring_attributes.xml +HWP_ATTR_XML_FILES += hwp/build_winkle_images/p8_slw_build/p8_xip_customize_attributes.xml +HWP_ATTR_XML_FILES += hwp/poreve_memory_attributes.xml +HWP_ATTR_XML_FILES += hwp/mcbist_attributes.xml +HWP_ATTR_XML_FILES += hwp/proc_winkle_scan_override_attributes.xml +HWP_ATTR_XML_FILES += hwp/erepair_thresholds.xml +HWP_ATTR_XML_FILES += hwp/dram_training/mem_pll_setup/memb_pll_ring_attributes.xml +HWP_ATTR_XML_FILES += hwp/proc_chip_ec_feature.xml +HWP_ATTR_XML_FILES += hwp/proc_abus_dmi_xbus_scominit_attributes.xml +HWP_ATTR_XML_FILES += hwp/runtime_attributes/memory_occ_attributes.xml #------------------------------------------------------------------------------ # PLL Ring Data files #------------------------------------------------------------------------------ -HWP_PLL_FILES = hwp/pll_attributes/s1_10_pll_ring.attributes \ - hwp/pll_attributes/s1_13_pll_ring.attributes \ - hwp/pll_attributes/s1_20_pll_ring.attributes \ - hwp/pll_attributes/s1_21_pll_ring.attributes \ - hwp/pll_attributes/p8_10_pll_ring.attributes \ - hwp/pll_attributes/p8_20_pll_ring.attributes \ - hwp/pll_attributes/centaur_10_pll_ring.attributes \ - hwp/pll_attributes/centaur_20_pll_ring.attributes \ - hwp/pll_attributes/centaur_21_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/s1_10_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/s1_13_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/s1_20_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/s1_21_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/p8_10_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/p8_20_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/centaur_10_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/centaur_20_pll_ring.attributes +HWP_PLL_FILES += hwp/pll_attributes/centaur_21_pll_ring.attributes #------------------------------------------------------------------------------ # Winkle Ring data files #------------------------------------------------------------------------------ -HWP_WINKLE_RING_FILES = hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes \ - hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes \ - hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes \ - hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes \ - hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes \ - hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes +HWP_WINKLE_RING_FILES += hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes +HWP_WINKLE_RING_FILES += hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes +HWP_WINKLE_RING_FILES += hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes +HWP_WINKLE_RING_FILES += hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes +HWP_WINKLE_RING_FILES += hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes +HWP_WINKLE_RING_FILES += hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes #------------------------------------------------------------------------------ # Initfiles #------------------------------------------------------------------------------ -HWP_INITFILES = hwp/initfiles/sample.initfile \ - hwp/initfiles/cen.dmi.scom.initfile \ - hwp/initfiles/p8.dmi.scom.initfile \ - hwp/initfiles/mbs_def.initfile \ - hwp/initfiles/mba_def.initfile \ - hwp/initfiles/cen_ddrphy.initfile \ - hwp/initfiles/p8.fbc.scom.initfile \ - hwp/initfiles/p8.pe.phase1.scom.initfile \ - hwp/initfiles/p8.pe.phase2.scom.initfile \ - hwp/initfiles/p8.abus.scom.initfile \ - hwp/initfiles/p8.xbus.scom.initfile \ - hwp/initfiles/p8.mcs.scom.initfile \ - hwp/initfiles/p8.as.scom.initfile \ - hwp/initfiles/p8.nx.scom.initfile \ - hwp/initfiles/p8.dmi.custom.scom.initfile \ - hwp/initfiles/cen.dmi.custom.scom.initfile \ - hwp/initfiles/p8.abus.custom.scom.initfile \ - hwp/initfiles/p8.xbus.custom.scom.initfile \ - hwp/initfiles/p8.psi.scom.initfile \ - hwp/initfiles/p8.tpbridge.scom.initfile \ - hwp/initfiles/p8.cxa.scom.initfile \ - hwp/initfiles/p8.a_x_pci_dmi_fir.scom.initfile +HWP_INITFILES += hwp/initfiles/sample.initfile +HWP_INITFILES += hwp/initfiles/cen.dmi.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.dmi.scom.initfile +HWP_INITFILES += hwp/initfiles/mbs_def.initfile +HWP_INITFILES += hwp/initfiles/mba_def.initfile +HWP_INITFILES += hwp/initfiles/cen_ddrphy.initfile +HWP_INITFILES += hwp/initfiles/p8.fbc.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.pe.phase1.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.pe.phase2.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.abus.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.xbus.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.mcs.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.as.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.nx.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.dmi.custom.scom.initfile +HWP_INITFILES += hwp/initfiles/cen.dmi.custom.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.abus.custom.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.xbus.custom.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.psi.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.tpbridge.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.cxa.scom.initfile +HWP_INITFILES += hwp/initfiles/p8.a_x_pci_dmi_fir.scom.initfile HWP_IF_DEFINE_DIR = hwp/initfiles @@ -265,15 +265,15 @@ IF_CMP_YACC_H_TARGET = $(IF_CMP_SUBDIR)/ifcompiler.y.tab.h IF_CMP_FLEX_TARGET = $(IF_CMP_SUBDIR)/ifcompiler.lex.yy.c IF_CMP_COMPILER_TARGET = ifcompiler -IF_COMPILER_C_FILES = ifcompiler/initCompiler.C \ - ifcompiler/initRpn.C \ - ifcompiler/initScom.C \ - ifcompiler/initSymbols.C +IF_COMPILER_C_FILES += ifcompiler/initCompiler.C +IF_COMPILER_C_FILES += ifcompiler/initRpn.C +IF_COMPILER_C_FILES += ifcompiler/initScom.C +IF_COMPILER_C_FILES += ifcompiler/initSymbols.C -IF_COMPILER_H_FILES = ifcompiler/initCompiler.H \ - ifcompiler/initRpn.H \ - ifcompiler/initScom.H \ - ifcompiler/initSymbols.H +IF_COMPILER_H_FILES += ifcompiler/initCompiler.H +IF_COMPILER_H_FILES += ifcompiler/initRpn.H +IF_COMPILER_H_FILES += ifcompiler/initScom.H +IF_COMPILER_H_FILES += ifcompiler/initSymbols.H IF_COMPILER_O_FILES = $(addprefix $(GENDIR)/$(IF_CMP_SUBDIR)/, \ $(call notdir, $(IF_COMPILER_C_FILES:.C=.host.o)) \ @@ -284,8 +284,10 @@ IF_COMPILER_O_FILES = $(addprefix $(GENDIR)/$(IF_CMP_SUBDIR)/, \ CLEAN_TARGETS += $(IF_COMPILER_O_FILES) # The FAPI files generated from Error XML files -FAPI_ERROR_TARGETS = fapiHwpReturnCodes.H fapiHwpErrorInfo.H \ - fapiCollectRegFfdc.C fapiSetSbeError.H +FAPI_ERROR_TARGETS += fapiHwpReturnCodes.H +FAPI_ERROR_TARGETS += fapiHwpErrorInfo.H +FAPI_ERROR_TARGETS += fapiCollectRegFfdc.C +FAPI_ERROR_TARGETS += fapiSetSbeError.H # The PLAT HWP Error Parser file generated from Error XML files PLAT_HWP_ERR_PARSER = fapiPlatHwpErrParser.H @@ -300,9 +302,11 @@ FAPI_PLL_TARGET = fapiPllRingAttr.H FAPI_WINKLE_RING_TARGET = fapiL3DeltaDataAttr.H # The FAPI files generated from Attribute XML files -FAPI_ATTR_TARGETS = fapiChipEcFeature.C fapiAttributePlatCheck.H \ - fapiAttributesSupported.html fapiAttrInfo.csv \ - fapiAttrEnumInfo.csv +FAPI_ATTR_TARGETS += fapiChipEcFeature.C +FAPI_ATTR_TARGETS += fapiAttributePlatCheck.H +FAPI_ATTR_TARGETS += fapiAttributesSupported.html +FAPI_ATTR_TARGETS += fapiAttrInfo.csv +FAPI_ATTR_TARGETS += fapiAttrEnumInfo.csv # The binary, list and attr files generated from Initfiles # Generation depends on ifcompiler and fapiAttributeIds.H @@ -311,24 +315,25 @@ HWP_IF_BASENAMES = $(basename ${HWP_IF_NAMES}) HWP_IF_BIN_TARGETS = $(addsuffix .if, ${HWP_IF_BASENAMES}) HWP_IF_LST_TARGETS = $(addsuffix .if.list.bz2, ${HWP_IF_BASENAMES}) HWP_IF_ATT_TARGETS = $(addsuffix .if.attr, ${HWP_IF_BASENAMES}) -HWP_IF_ALL_TARGETS = ${HWP_IF_BIN_TARGETS} ${HWP_IF_LST_TARGETS} \ - ${HWP_IF_ATT_TARGETS} +HWP_IF_ALL_TARGETS += ${HWP_IF_BIN_TARGETS} +HWP_IF_ALL_TARGETS += ${HWP_IF_LST_TARGETS} +HWP_IF_ALL_TARGETS += ${HWP_IF_ATT_TARGETS} # The FAPI Initfile attribute service # Generation depends on the Initfile <name>.if.attr files FAPI_ATTR_IF_TARGET = fapiAttributeService.C -GENFILES = ${IF_CMP_YACC_C_TARGET} \ - ${IF_CMP_YACC_H_TARGET} \ - ${IF_CMP_FLEX_TARGET} \ - ${IF_CMP_COMPILER_TARGET} \ - ${FAPI_ERROR_TARGETS} \ - ${FAPI_ATTR_ID_TARGET} \ - ${FAPI_ATTR_TARGETS} \ - ${HWP_IF_ALL_TARGETS} \ - ${FAPI_ATTR_IF_TARGET} \ - ${FAPI_PLL_TARGET} \ - ${FAPI_WINKLE_RING_TARGET} +GENFILES += ${IF_CMP_YACC_C_TARGET} +GENFILES += ${IF_CMP_YACC_H_TARGET} +GENFILES += ${IF_CMP_FLEX_TARGET} +GENFILES += ${IF_CMP_COMPILER_TARGET} +GENFILES += ${FAPI_ERROR_TARGETS} +GENFILES += ${FAPI_ATTR_ID_TARGET} +GENFILES += ${FAPI_ATTR_TARGETS} +GENFILES += ${HWP_IF_ALL_TARGETS} +GENFILES += ${FAPI_ATTR_IF_TARGET} +GENFILES += ${FAPI_PLL_TARGET} +GENFILES += ${FAPI_WINKLE_RING_TARGET} GENFILES_PLUGINS = ${PLAT_HWP_ERR_PARSER} diff --git a/src/usr/hwpf/plat/makefile b/src/usr/hwpf/plat/makefile index 99edcb31e..dc34231bd 100644 --- a/src/usr/hwpf/plat/makefile +++ b/src/usr/hwpf/plat/makefile @@ -28,6 +28,6 @@ include plat.mk OBJS += fapiPlatTask.o -SUBDIRS = runtime.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/hwpf/plat/plat.mk b/src/usr/hwpf/plat/plat.mk index 7abad2167..187f8fd47 100644 --- a/src/usr/hwpf/plat/plat.mk +++ b/src/usr/hwpf/plat/plat.mk @@ -26,14 +26,14 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp -OBJS = fapiPlatHwAccess.o \ - fapiPlatHwpInvoker.o \ - fapiPlatReturnCodeDataRef.o \ - fapiPlatSystemConfig.o \ - fapiPlatTarget.o \ - fapiPlatUtil.o \ - fapiPlatAttributeService.o \ - fapiPlatMvpdAccess.o \ - fapiPlatMBvpdAccess.o \ - fapiPlatAttrOverrideSync.o +OBJS += fapiPlatHwAccess.o +OBJS += fapiPlatHwpInvoker.o +OBJS += fapiPlatReturnCodeDataRef.o +OBJS += fapiPlatSystemConfig.o +OBJS += fapiPlatTarget.o +OBJS += fapiPlatUtil.o +OBJS += fapiPlatAttributeService.o +OBJS += fapiPlatMvpdAccess.o +OBJS += fapiPlatMBvpdAccess.o +OBJS += fapiPlatAttrOverrideSync.o diff --git a/src/usr/hwpf/test/makefile b/src/usr/hwpf/test/makefile index 508080edc..381d86aa7 100644 --- a/src/usr/hwpf/test/makefile +++ b/src/usr/hwpf/test/makefile @@ -26,7 +26,7 @@ MODULE = testhwpf include hwpftest.mk TESTS = *.H -SUBDIRS = runtime.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/hwpf/test/runtime/makefile b/src/usr/hwpf/test/runtime/makefile index bef3cfd42..caff077b1 100644 --- a/src/usr/hwpf/test/runtime/makefile +++ b/src/usr/hwpf/test/runtime/makefile @@ -27,9 +27,13 @@ MODULE = testhwpf_rt include ../hwpftest.mk -TESTS = ../fapiattrtest.H ../fapitargettest.H ../fapirctest.H ../hwpftest.H \ - rt_occtest.H -# ../hwpMvpdAccessorTest.H ../hwpMBvpdAccessorTest.H +TESTS += ../fapiattrtest.H +TESTS += ../fapitargettest.H +TESTS += ../fapirctest.H +TESTS += ../hwpftest.H +TESTS += rt_occtest.H +#TESTS += ../hwpMvpdAccessorTest.H +#TESTS += ../hwpMBvpdAccessorTest.H include ${ROOTPATH}/config.mk diff --git a/src/usr/i2c/makefile b/src/usr/i2c/makefile index b1133f258..a90b20e97 100644 --- a/src/usr/i2c/makefile +++ b/src/usr/i2c/makefile @@ -23,8 +23,10 @@ ROOTPATH = ../../.. MODULE = i2c -OBJS = i2c.o eepromdd.o errlud_i2c.o +OBJS += i2c.o +OBJS += eepromdd.o +OBJS += errlud_i2c.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/ibscom/makefile b/src/usr/ibscom/makefile index 1ece9f652..6237d25fd 100644 --- a/src/usr/ibscom/makefile +++ b/src/usr/ibscom/makefile @@ -1,30 +1,30 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/usr/ibscom/makefile $ -# -# IBM CONFIDENTIAL -# -# COPYRIGHT International Business Machines Corp. 2012 -# -# p1 -# -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code -# -# The source code for this program is not published or otherwise -# divested of its trade secrets, irrespective of what has been -# deposited with the U.S. Copyright Office. -# -# Origin: 30 -# -# IBM_PROLOG_END_TAG +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/ibscom/makefile $ +# +# IBM CONFIDENTIAL +# +# COPYRIGHT International Business Machines Corp. 2012,2014 +# +# p1 +# +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code +# +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. +# +# Origin: 30 +# +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. MODULE = ibscom -OBJS = ibscom.o +OBJS += ibscom.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/initservice/baseinitsvc/makefile b/src/usr/initservice/baseinitsvc/makefile index 0bbe15d22..89b7f1e56 100644 --- a/src/usr/initservice/baseinitsvc/makefile +++ b/src/usr/initservice/baseinitsvc/makefile @@ -1,28 +1,28 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/initservice/baseinitsvc/makefile $ +# $Source: src/usr/initservice/baseinitsvc/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../../.. MODULE = initservice -OBJS = initservice.o +OBJS += initservice.o include ${ROOTPATH}/config.mk diff --git a/src/usr/initservice/extinitsvc/makefile b/src/usr/initservice/extinitsvc/makefile index 79d5807b4..4377881b4 100644 --- a/src/usr/initservice/extinitsvc/makefile +++ b/src/usr/initservice/extinitsvc/makefile @@ -1,28 +1,28 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/initservice/extinitsvc/makefile $ +# $Source: src/usr/initservice/extinitsvc/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../../.. MODULE = extinitsvc -OBJS = extinitsvc.o +OBJS += extinitsvc.o include ${ROOTPATH}/config.mk diff --git a/src/usr/initservice/initsvctesttask/makefile b/src/usr/initservice/initsvctesttask/makefile index 8bdd7cf28..a9f0f968e 100644 --- a/src/usr/initservice/initsvctesttask/makefile +++ b/src/usr/initservice/initsvctesttask/makefile @@ -1,28 +1,28 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/initservice/initsvctasktest2/makefile $ +# $Source: src/usr/initservice/initsvctesttask/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../../.. MODULE = initsvctesttask -OBJS = tasktest2.o +OBJS += tasktest2.o include ${ROOTPATH}/config.mk diff --git a/src/usr/initservice/istepdispatcher/makefile b/src/usr/initservice/istepdispatcher/makefile index 550a4644d..084317447 100644 --- a/src/usr/initservice/istepdispatcher/makefile +++ b/src/usr/initservice/istepdispatcher/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -29,9 +29,11 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp -OBJS = istepdispatcher.o initsvcudistep.o \ - sptask.o splesscommon.o +OBJS += istepdispatcher.o +OBJS += initsvcudistep.o +OBJS += sptask.o +OBJS += splesscommon.o -## SUBDIRS = test.d +## SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/initservice/makefile b/src/usr/initservice/makefile index c87b7187a..9ad98189e 100644 --- a/src/usr/initservice/makefile +++ b/src/usr/initservice/makefile @@ -1,34 +1,38 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/initservice/makefile $ +# $Source: src/usr/initservice/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. -# MODULE = +# MODULE = -# OBJS = +# OBJS += -# NOTE: initsvctest is a dummy module that is executed by +# NOTE: initsvctest is a dummy module that is executed by # unit test 2 in the test directory. Please do not rename. -SUBDIRS = baseinitsvc.d extinitsvc.d istepdispatcher.d \ - test.d initsvctesttask.d build.d +SUBDIRS += baseinitsvc.d +SUBDIRS += extinitsvc.d +SUBDIRS += istepdispatcher.d +SUBDIRS += test.d +SUBDIRS += initsvctesttask.d +SUBDIRS += build.d include ${ROOTPATH}/config.mk diff --git a/src/usr/intr/makefile b/src/usr/intr/makefile index e9b520654..c6e7b04d4 100644 --- a/src/usr/intr/makefile +++ b/src/usr/intr/makefile @@ -1,30 +1,30 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/intr/makefile $ +# $Source: src/usr/intr/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. MODULE = intr -OBJS = intrrp.o +OBJS += intrrp.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/makefile b/src/usr/makefile index 6433dba12..cfba726c7 100644 --- a/src/usr/makefile +++ b/src/usr/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2010,2013 +# COPYRIGHT International Business Machines Corp. 2010,2014 # # p1 # @@ -24,12 +24,37 @@ ROOTPATH = ../.. # Do not instrument the module_init.o HOSTBOOT_PROFILE_NO_INSTRUMENT = 1 -OBJS = module_init.o +OBJS += module_init.o -SUBDIRS = trace.d cxxtest.d testcore.d errl.d devicefw.d \ - scom.d xscom.d targeting.d initservice.d hwpf.d \ - ecmddatabuffer.d pnor.d i2c.d vfs.d fsi.d hwas.d fsiscom.d \ - intr.d pore.d util.d mbox.d diag.d vpd.d scan.d \ - runtime.d ibscom.d dump.d secureboot.d devtree.d sbe.d +SUBDIRS += trace.d +SUBDIRS += cxxtest.d +SUBDIRS += testcore.d +SUBDIRS += errl.d +SUBDIRS += devicefw.d +SUBDIRS += scom.d +SUBDIRS += xscom.d +SUBDIRS += targeting.d +SUBDIRS += initservice.d +SUBDIRS += hwpf.d +SUBDIRS += ecmddatabuffer.d +SUBDIRS += pnor.d +SUBDIRS += i2c.d +SUBDIRS += vfs.d +SUBDIRS += fsi.d +SUBDIRS += hwas.d +SUBDIRS += fsiscom.d +SUBDIRS += intr.d +SUBDIRS += pore.d +SUBDIRS += util.d +SUBDIRS += mbox.d +SUBDIRS += diag.d +SUBDIRS += vpd.d +SUBDIRS += scan.d +SUBDIRS += runtime.d +SUBDIRS += ibscom.d +SUBDIRS += dump.d +SUBDIRS += secureboot.d +SUBDIRS += devtree.d +SUBDIRS += sbe.d include ${ROOTPATH}/config.mk diff --git a/src/usr/mbox/makefile b/src/usr/mbox/makefile index 554050677..8979c9bcf 100644 --- a/src/usr/mbox/makefile +++ b/src/usr/mbox/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -23,8 +23,11 @@ ROOTPATH = ../../.. MODULE = mbox -OBJS = mboxdd.o mailboxsp.o mbox_dma_buffer.o ipcSp.o +OBJS += mboxdd.o +OBJS += mailboxsp.o +OBJS += mbox_dma_buffer.o +OBJS += ipcSp.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/pnor/makefile b/src/usr/pnor/makefile index 445c61739..c3d15cc6e 100644 --- a/src/usr/pnor/makefile +++ b/src/usr/pnor/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -23,8 +23,10 @@ ROOTPATH = ../../.. MODULE = pnor -OBJS = pnorrp.o pnordd.o ecc.o +OBJS += pnorrp.o +OBJS += pnordd.o +OBJS += ecc.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/pore/fapiporeve/makefile b/src/usr/pore/fapiporeve/makefile index b83666c75..ab32bdd46 100644 --- a/src/usr/pore/fapiporeve/makefile +++ b/src/usr/pore/fapiporeve/makefile @@ -1,29 +1,29 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/pore/fapiporeve/makefile $ +# $Source: src/usr/pore/fapiporeve/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../../.. # fapiporeve provides interfaces to create a poreve object -# with a set of pre-defined arguments +# with a set of pre-defined arguments MODULE = fapiporeve EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer @@ -34,6 +34,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/pore/poreve/porevesrc EXTRAINCDIR += ${ROOTPATH}/src/usr/pore/poreve/pore_model EXTRAINCDIR += ${ROOTPATH}/src/usr/pore/poreve/model -OBJS = fapiPoreVe.o fapiPoreVeArg.o +OBJS += fapiPoreVe.o +OBJS += fapiPoreVeArg.o include ${ROOTPATH}/config.mk diff --git a/src/usr/pore/makefile b/src/usr/pore/makefile index c863fbee8..c89875c29 100644 --- a/src/usr/pore/makefile +++ b/src/usr/pore/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -22,5 +22,7 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../.. -SUBDIRS = fapiporeve.d poreve.d test.d +SUBDIRS += fapiporeve.d +SUBDIRS += poreve.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/pore/poreve/makefile b/src/usr/pore/poreve/makefile index 8d53bc194..7f639970b 100644 --- a/src/usr/pore/poreve/makefile +++ b/src/usr/pore/poreve/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -29,7 +29,7 @@ # environment (e.g., poreve). # # pore_model Model the hardware of the PORE. This containts the "pore-engine-core/interpreter" of the PORe simulation -# The code in this directory is owned by Boeblingen team. +# The code in this directory is owned by Boeblingen team. # # porevesrc The Source code of the PoreVe class, including the Bus and # Slave models, and the HookManager. @@ -49,10 +49,28 @@ CFLAGS += -DDEBUG_FASTI2C=1 -D_BIG_ENDIAN=1 # Override to use C++ compiler for %.c/h files CC_OVERRIDE = 1 -OBJS = poreveutil.o -OBJS += transaction.o poreaddress.o poremodel.o poreregister.o poreinterface.o porestate.o -OBJS += pore_model.o pore_bus.o pore_fi2c.o pore_inline_decode.o vsbe.o pibmem.o -OBJS += pore.o bus.o hookmanager.o poreve.o pib2cfam.o fasti2c.o sbevital.o create.o +OBJS += poreveutil.o +OBJS += transaction.o +OBJS += poreaddress.o +OBJS += poremodel.o +OBJS += poreregister.o +OBJS += poreinterface.o +OBJS += porestate.o +OBJS += pore_model.o +OBJS += pore_bus.o +OBJS += pore_fi2c.o +OBJS += pore_inline_decode.o +OBJS += vsbe.o +OBJS += pibmem.o +OBJS += pore.o +OBJS += bus.o +OBJS += hookmanager.o +OBJS += poreve.o +OBJS += pib2cfam.o +OBJS += fasti2c.o +OBJS += sbevital.o +OBJS += create.o + HOOK_SOURCE_FILES = $(notdir $(wildcard ./hook/*sbe*.hooks.cc)) OBJS += $(patsubst %.cc,%.o,$(HOOK_SOURCE_FILES)) diff --git a/src/usr/runtime/makefile b/src/usr/runtime/makefile index 854e4da32..00d8b1d6a 100644 --- a/src/usr/runtime/makefile +++ b/src/usr/runtime/makefile @@ -31,10 +31,13 @@ ROOTPATH = ../../.. MODULE = runtime -OBJS = populate_attributes.o hdatservice.o fakepayload.o tce.o \ - errlud_hdat.o +OBJS += populate_attributes.o +OBJS += hdatservice.o +OBJS += fakepayload.o +OBJS += tce.o +OBJS += errlud_hdat.o -SUBDIRS = test.d +SUBDIRS += test.d ## support for fapi EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer diff --git a/src/usr/sbe/makefile b/src/usr/sbe/makefile index 50de91c2d..cc6434a71 100644 --- a/src/usr/sbe/makefile +++ b/src/usr/sbe/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -35,8 +35,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include ## pointer to already consumed procedures. EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build -OBJS = sbe_update.o +OBJS += sbe_update.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/scan/makefile b/src/usr/scan/makefile index 8f43c9607..bfd3b8f5c 100644 --- a/src/usr/scan/makefile +++ b/src/usr/scan/makefile @@ -1,30 +1,30 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/usr/scan/makefile $ -# -# IBM CONFIDENTIAL -# -# COPYRIGHT International Business Machines Corp. 2011,2012 -# -# p1 -# -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code -# -# The source code for this program is not published or otherwise -# divested of its trade secrets, irrespective of what has been -# deposited with the U.S. Copyright Office. -# -# Origin: 30 -# -# IBM_PROLOG_END_TAG +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/scan/makefile $ +# +# IBM CONFIDENTIAL +# +# COPYRIGHT International Business Machines Corp. 2011,2014 +# +# p1 +# +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code +# +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. +# +# Origin: 30 +# +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. MODULE = scan -OBJS = scandd.o +OBJS += scandd.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/scom/makefile b/src/usr/scom/makefile index 3579acbcc..3773f8d0b 100644 --- a/src/usr/scom/makefile +++ b/src/usr/scom/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -29,6 +29,7 @@ include scom.mk #include unique object modules - currently none # OBJS += -SUBDIRS = test.d runtime.d +SUBDIRS += test.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/scom/runtime/makefile b/src/usr/scom/runtime/makefile index f31b0def5..318f425e4 100644 --- a/src/usr/scom/runtime/makefile +++ b/src/usr/scom/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -30,7 +30,7 @@ include ../scom.mk #include unique object modules - currently none # OBJS += -SUBDIRS = test.d +SUBDIRS += test.d VPATH += .. include $(ROOTPATH)/config.mk diff --git a/src/usr/scom/scom.mk b/src/usr/scom/scom.mk index 44ae2fc45..1532bbbdf 100644 --- a/src/usr/scom/scom.mk +++ b/src/usr/scom/scom.mk @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -21,4 +21,5 @@ # # IBM_PROLOG_END_TAG # common objects between hostboot and runtime hostboot -OBJS = scom.o scomtrans.o +OBJS += scom.o +OBJS += scomtrans.o diff --git a/src/usr/secureboot/base/makefile b/src/usr/secureboot/base/makefile index 479b8aa32..e280d59c7 100644 --- a/src/usr/secureboot/base/makefile +++ b/src/usr/secureboot/base/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -22,9 +22,14 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../../.. MODULE = secureboot_base -SUBDIRS = test.d +SUBDIRS += test.d -OBJS = service.o settings.o header.o purge.o securerom.o rom_entry.o +OBJS += service.o +OBJS += settings.o +OBJS += header.o +OBJS += purge.o +OBJS += securerom.o +OBJS += rom_entry.o CFLAGS += -iquote ../ include ${ROOTPATH}/config.mk diff --git a/src/usr/secureboot/ext/makefile b/src/usr/secureboot/ext/makefile index dd62accc2..b2ac6d968 100644 --- a/src/usr/secureboot/ext/makefile +++ b/src/usr/secureboot/ext/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -22,9 +22,9 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../../.. MODULE = secureboot_ext -SUBDIRS = +SUBDIRS += -OBJS = +OBJS += CFLAGS += -iquote ../ include ${ROOTPATH}/config.mk diff --git a/src/usr/secureboot/makefile b/src/usr/secureboot/makefile index d406bb620..6ea748cd5 100644 --- a/src/usr/secureboot/makefile +++ b/src/usr/secureboot/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -22,6 +22,7 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../.. -SUBDIRS = base.d ext.d +SUBDIRS += base.d +SUBDIRS += ext.d include ${ROOTPATH}/config.mk diff --git a/src/usr/targeting/common/common.mk b/src/usr/targeting/common/common.mk index 520f0462d..625e5b9b2 100644 --- a/src/usr/targeting/common/common.mk +++ b/src/usr/targeting/common/common.mk @@ -29,34 +29,32 @@ # ################################################################################ -COMMON_TARGETING_SUBDIRS = predicates iterators +COMMON_TARGETING_SUBDIRS += predicates +COMMON_TARGETING_SUBDIRS += iterators -PREDICATES_OBJS = \ - predicatebase.o \ - predicatepostfixexpr.o \ - predicatectm.o \ - predicateisfunctional.o \ - predicatehwas.o \ - predicatehwaschanged.o \ - predicateisnonfunctional.o +PREDICATES_OBJS += predicatebase.o +PREDICATES_OBJS += predicatepostfixexpr.o +PREDICATES_OBJS += predicatectm.o +PREDICATES_OBJS += predicateisfunctional.o +PREDICATES_OBJS += predicatehwas.o +PREDICATES_OBJS += predicatehwaschanged.o +PREDICATES_OBJS += predicateisnonfunctional.o -ITERATORS_OBJS = \ - targetiterator.o \ - rawtargetiterator.o \ - rangefilter.o +ITERATORS_OBJS += targetiterator.o +ITERATORS_OBJS += rawtargetiterator.o +ITERATORS_OBJS += rangefilter.o -TARGET_OBJS = \ - target.o \ - targetservice.o \ - entitypath.o +TARGET_OBJS += target.o +TARGET_OBJS += targetservice.o +TARGET_OBJS += entitypath.o -OTHER_OBJS = \ - util.o utilFilter.o attributeTank.o +OTHER_OBJS += util.o +OTHER_OBJS += utilFilter.o +OTHER_OBJS += attributeTank.o # Common -COMMON_TARGETING_OBJS = \ - ${TARGET_OBJS} \ - ${PREDICATES_OBJS} \ - ${ITERATORS_OBJS} \ - ${OTHER_OBJS} +COMMON_TARGETING_OBJS += ${TARGET_OBJS} +COMMON_TARGETING_OBJS += ${PREDICATES_OBJS} +COMMON_TARGETING_OBJS += ${ITERATORS_OBJS} +COMMON_TARGETING_OBJS += ${OTHER_OBJS} diff --git a/src/usr/targeting/common/test/common.mk b/src/usr/targeting/common/test/common.mk index 36e9fed76..b90712f46 100644 --- a/src/usr/targeting/common/test/common.mk +++ b/src/usr/targeting/common/test/common.mk @@ -1,36 +1,38 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/targeting/common/test/common.mk $ +# $Source: src/usr/targeting/common/test/common.mk $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ################################################################################ # # @file targeting/common/test/common.mk # -# @brief Common test makefile to be included in targeting/test/makefile +# @brief Common test makefile to be included in targeting/test/makefile # ################################################################################ -HWPF_INC_DIRS += fapi plat hwp +HWPF_INC_DIRS += fapi +HWPF_INC_DIRS += plat +HWPF_INC_DIRS += hwp -COMMON_TESTCASES = testcommontargeting.H +COMMON_TESTCASES += testcommontargeting.H -OBJS = ${COMMON_OBJS} +OBJS += ${COMMON_OBJS} diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk index 0c3e20b97..0543c291b 100644 --- a/src/usr/targeting/common/xmltohb/common.mk +++ b/src/usr/targeting/common/xmltohb/common.mk @@ -29,74 +29,65 @@ # ################################################################################ -XMLTOHB_HEADER_TARGETS = \ - attributeenums.H \ - attributestrings.H \ - attributetraits.H \ - attributestructs.H \ - pnortargeting.H \ - fapiplatattrmacros.H \ - test_ep.H \ - mapattrmetadata.H \ - mapsystemattrsize.H +XMLTOHB_HEADER_TARGETS += attributeenums.H +XMLTOHB_HEADER_TARGETS += attributestrings.H +XMLTOHB_HEADER_TARGETS += attributetraits.H +XMLTOHB_HEADER_TARGETS += attributestructs.H +XMLTOHB_HEADER_TARGETS += pnortargeting.H +XMLTOHB_HEADER_TARGETS += fapiplatattrmacros.H +XMLTOHB_HEADER_TARGETS += test_ep.H +XMLTOHB_HEADER_TARGETS += mapattrmetadata.H +XMLTOHB_HEADER_TARGETS += mapsystemattrsize.H -XMLTOHB_SOURCE_TARGETS = \ - attributestrings.C \ - attributedump.C \ - errludattribute.C \ - errludtarget.C \ - mapattrmetadata.C \ - mapsystemattrsize.C +XMLTOHB_SOURCE_TARGETS += attributestrings.C +XMLTOHB_SOURCE_TARGETS += attributedump.C +XMLTOHB_SOURCE_TARGETS += errludattribute.C +XMLTOHB_SOURCE_TARGETS += errludtarget.C +XMLTOHB_SOURCE_TARGETS += mapattrmetadata.C +XMLTOHB_SOURCE_TARGETS += mapsystemattrsize.C -XMLTOHB_SYSTEM_BINARIES = \ - vbu_VENICE_targeting.bin \ - vbu_MURANO_targeting.bin \ - simics_VENICE_targeting.bin \ - simics_MURANO_targeting.bin +XMLTOHB_SYSTEM_BINARIES += vbu_VENICE_targeting.bin +XMLTOHB_SYSTEM_BINARIES += vbu_MURANO_targeting.bin +XMLTOHB_SYSTEM_BINARIES += simics_VENICE_targeting.bin +XMLTOHB_SYSTEM_BINARIES += simics_MURANO_targeting.bin -XMLTOHB_TARGETS = \ - ${XMLTOHB_HEADER_TARGETS} \ - ${XMLTOHB_SOURCE_TARGETS} +XMLTOHB_TARGETS += ${XMLTOHB_HEADER_TARGETS} +XMLTOHB_TARGETS += ${XMLTOHB_SOURCE_TARGETS} -XMLTOHB_GENERIC_SOURCES = \ - attribute_types.xml \ - target_types.xml +FAPI_ATTR_SOURCES += memory_attributes.xml +FAPI_ATTR_SOURCES += L2_L3_attributes.xml +FAPI_ATTR_SOURCES += scratch_attributes.xml +FAPI_ATTR_SOURCES += system_attributes.xml +FAPI_ATTR_SOURCES += chip_attributes.xml +FAPI_ATTR_SOURCES += dimm_spd_attributes.xml +FAPI_ATTR_SOURCES += dimm_attributes.xml +FAPI_ATTR_SOURCES += unit_attributes.xml +FAPI_ATTR_SOURCES += freq_attributes.xml +FAPI_ATTR_SOURCES += ei_bus_attributes.xml +FAPI_ATTR_SOURCES += dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml +FAPI_ATTR_SOURCES += dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml +FAPI_ATTR_SOURCES += dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml +FAPI_ATTR_SOURCES += activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml +FAPI_ATTR_SOURCES += runtime_attributes/pm_hwp_attributes.xml +FAPI_ATTR_SOURCES += runtime_attributes/pm_plat_attributes.xml +FAPI_ATTR_SOURCES += nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml +FAPI_ATTR_SOURCES += dmi_training/proc_cen_set_inband_addr/proc_cen_set_inband_addr_attributes.xml +FAPI_ATTR_SOURCES += common_attributes.xml +FAPI_ATTR_SOURCES += build_winkle_images/p8_slw_build/proc_pll_ring_attributes.xml +FAPI_ATTR_SOURCES += build_winkle_images/p8_slw_build/p8_xip_customize_attributes.xml +FAPI_ATTR_SOURCES += sync_attributes.xml +FAPI_ATTR_SOURCES += poreve_memory_attributes.xml +FAPI_ATTR_SOURCES += mcbist_attributes.xml +FAPI_ATTR_SOURCES += proc_winkle_scan_override_attributes.xml +FAPI_ATTR_SOURCES += erepair_thresholds.xml +FAPI_ATTR_SOURCES += dram_training/mem_pll_setup/memb_pll_ring_attributes.xml +FAPI_ATTR_SOURCES += runtime_attributes/memory_occ_attributes.xml +FAPI_ATTR_SOURCES += proc_abus_dmi_xbus_scominit_attributes.xml -FAPI_ATTR_SOURCES = \ - memory_attributes.xml \ - L2_L3_attributes.xml \ - scratch_attributes.xml \ - system_attributes.xml \ - chip_attributes.xml \ - dimm_spd_attributes.xml \ - dimm_attributes.xml \ - unit_attributes.xml \ - freq_attributes.xml \ - ei_bus_attributes.xml \ - dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml \ - dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml \ - dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml \ - activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml \ - runtime_attributes/pm_hwp_attributes.xml \ - runtime_attributes/pm_plat_attributes.xml \ - nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml \ - dmi_training/proc_cen_set_inband_addr/proc_cen_set_inband_addr_attributes.xml \ - common_attributes.xml \ - build_winkle_images/p8_slw_build/proc_pll_ring_attributes.xml \ - build_winkle_images/p8_slw_build/p8_xip_customize_attributes.xml \ - sync_attributes.xml \ - poreve_memory_attributes.xml \ - mcbist_attributes.xml \ - proc_winkle_scan_override_attributes.xml \ - erepair_thresholds.xml \ - dram_training/mem_pll_setup/memb_pll_ring_attributes.xml \ - runtime_attributes/memory_occ_attributes.xml \ - proc_abus_dmi_xbus_scominit_attributes.xml - -XMLTOHB_GENERIC_XML = generic.xml -XMLTOHB_FAPI_XML = fapiattrs.xml -XMLTOHB_MERGE_SCRIPT = mergexml.sh -XMLTOHB_COMPILER_SCRIPT = xmltohb.pl -VMM_CONSTS_FILE = vmmconst.h +XMLTOHB_GENERIC_XML += generic.xml +XMLTOHB_FAPI_XML += fapiattrs.xml +XMLTOHB_MERGE_SCRIPT += mergexml.sh +XMLTOHB_COMPILER_SCRIPT += xmltohb.pl +VMM_CONSTS_FILE += vmmconst.h GENERATED_CODE = ${XMLTOHB_TARGETS} diff --git a/src/usr/targeting/hostboot_common.mk b/src/usr/targeting/hostboot_common.mk index ab70e57f4..09a05ed58 100644 --- a/src/usr/targeting/hostboot_common.mk +++ b/src/usr/targeting/hostboot_common.mk @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -26,8 +26,7 @@ COMMON_TARGETING_MAKEFILE = ${COMMON_TARGETING_REL_PATH}/common.mk include ${COMMON_TARGETING_MAKEFILE} -VPATH += \ - ${TARGETING_REL_PATH}/adapters \ - ${COMMON_TARGETING_REL_PATH} \ - ${addprefix ${COMMON_TARGETING_REL_PATH}/, ${COMMON_TARGETING_SUBDIRS}} +VPATH += ${TARGETING_REL_PATH}/adapters +VPATH += ${COMMON_TARGETING_REL_PATH} +VPATH += ${addprefix ${COMMON_TARGETING_REL_PATH}/, ${COMMON_TARGETING_SUBDIRS}} diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile index 372354842..15c99fab0 100644 --- a/src/usr/targeting/makefile +++ b/src/usr/targeting/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -34,22 +34,18 @@ MODULE = targeting TARGETING_REL_PATH = . include ${TARGETING_REL_PATH}/hostboot_common.mk -ATTR_RP_OBJS = \ - attrrp.o \ - attrsync.o \ - targplatutil.o +ATTR_RP_OBJS += attrrp.o +ATTR_RP_OBJS += attrsync.o +ATTR_RP_OBJS += targplatutil.o -ENTRY_POINT_OBJS = \ - targetservicestart.o +ENTRY_POINT_OBJS += targetservicestart.o -DEBUG_OBJS = \ - attributestrings.o +DEBUG_OBJS += attributestrings.o -HOSTBOOT_SPECIFIC_OBJS = \ - ${ENTRY_POINT_OBJS} \ - ${ATTR_RP_OBJS} \ - ${DEBUG_OBJS} \ - namedtarget.o +HOSTBOOT_SPECIFIC_OBJS += ${ENTRY_POINT_OBJS} +HOSTBOOT_SPECIFIC_OBJS += ${ATTR_RP_OBJS} +HOSTBOOT_SPECIFIC_OBJS += ${DEBUG_OBJS} +HOSTBOOT_SPECIFIC_OBJS += namedtarget.o #debug : @@ -59,9 +55,12 @@ HOSTBOOT_SPECIFIC_OBJS = \ # @echo VPATH = ${VPATH} # @echo COMMON_TARGETING_OBJS = ${COMMON_TARGETING_OBJS} -OBJS = ${COMMON_TARGETING_OBJS} ${HOSTBOOT_SPECIFIC_OBJS} +OBJS += ${COMMON_TARGETING_OBJS} +OBJS += ${HOSTBOOT_SPECIFIC_OBJS} -SUBDIRS = test.d xmltohb.d runtime.d +SUBDIRS += test.d +SUBDIRS += xmltohb.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile index 51296c71e..e193f3bc5 100644 --- a/src/usr/targeting/runtime/makefile +++ b/src/usr/targeting/runtime/makefile @@ -24,16 +24,19 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = targeting_rt -SUBDIRS = test.d +SUBDIRS += test.d TARGETING_REL_PATH = .. include ${TARGETING_REL_PATH}/hostboot_common.mk vpath %.C ${TARGETING_REL_PATH} -HOSTBOOT_RUNTIME_SPECIFIC_OBJS = attrrp_rt.o start_rt.o targplatutil.o \ - rt_targeting.o +HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrrp_rt.o +HOSTBOOT_RUNTIME_SPECIFIC_OBJS += start_rt.o +HOSTBOOT_RUNTIME_SPECIFIC_OBJS += targplatutil.o +HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_targeting.o -OBJS = ${COMMON_TARGETING_OBJS} ${HOSTBOOT_RUNTIME_SPECIFIC_OBJS} +OBJS += ${COMMON_TARGETING_OBJS} +OBJS += ${HOSTBOOT_RUNTIME_SPECIFIC_OBJS} include $(ROOTPATH)/config.mk vpath %.C ${GENDIR} diff --git a/src/usr/targeting/test/makefile b/src/usr/targeting/test/makefile index 6d8d3d1e1..1c53e048a 100644 --- a/src/usr/targeting/test/makefile +++ b/src/usr/targeting/test/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -24,7 +24,7 @@ # # @file src/usr/targeting/test/makefile # -# @brief Makefile for building Hostboot's targeting test dir +# @brief Makefile for building Hostboot's targeting test dir # ################################################################################ @@ -55,16 +55,19 @@ EXTRAINCDIR += \ ${ROOTPATH}/src/include/usr/ecmddatabuffer \ ../ -# Generate the test suite +# Generate the test suite MODULE = testtargeting COMMON_TESTCASE_REL_PATHS = \ $(addprefix ${COMMON_TARGETING_REL_PATH}/test/,${COMMON_TESTCASES}) -TESTS = testtargeting.H testattrsync.H testattrtank.H ${COMMON_TESTCASE_REL_PATHS} +TESTS += testtargeting.H +TESTS += testattrsync.H +TESTS += testattrtank.H +TESTS += ${COMMON_TESTCASE_REL_PATHS} -OBJS = attributestrings.o +OBJS += attributestrings.o #debug : # @echo EXTRAINCDIR = ${EXTRAINCDIR} @@ -74,8 +77,8 @@ OBJS = attributestrings.o # @echo INCLUDES = ${INCLUDES} # @echo COMMON_TESTCASE_REL_PATHS = ${COMMON_TESTCASE_REL_PATHS} # @echo COMMON_TESTCASES = ${COMMON_TESTCASES} -# @echo HWPF_INC_DIRS = ${HWPF_INC_DIRS} -# @echo TESTS = ${TESTS} +# @echo HWPF_INC_DIRS = ${HWPF_INC_DIRS} +# @echo TESTS = ${TESTS} include ${ROOTPATH}/config.mk diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 565f5c704..9e23fcf05 100644 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -24,7 +24,7 @@ # # @file targeting/xmltohb/makefile # -# @brief Makefile for building Hostboot's xmltohb dir +# @brief Makefile for building Hostboot's xmltohb dir # ################################################################################ @@ -41,7 +41,7 @@ COMMON_TARGETING_MAKEFILE = \ # Include the common targeting makefile for xmltohb verbatim include ${COMMON_TARGETING_MAKEFILE} -VPATH = ${COMMON_TARGETING_REL_PATH} +VPATH = ${COMMON_TARGETING_REL_PATH} FAPI_ATTR_SOURCE_DIR = ${ROOTPATH}/src/usr/hwpf/hwp @@ -56,12 +56,11 @@ XMLTOHB_HB_TARGET_SOURCES = target_types_hb.xml XMLTOHB_MERGED_COMMON_TARGET_SOURCES = target_types_merged.xml -#Redefine XMLTOHB_GENERIC_SOURCES -XMLTOHB_GENERIC_SOURCES = \ - ${XMLTOHB_COMMON_ATTRIBUTE_SOURCES} \ - ${XMLTOHB_HB_ATTRIBUTE_SOURCES} \ - ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} \ - ${XMLTOHB_HB_TARGET_SOURCES} +#Define XMLTOHB_GENERIC_SOURCES +XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_COMMON_ATTRIBUTE_SOURCES} +XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_HB_ATTRIBUTE_SOURCES} +XMLTOHB_GENERIC_SOURCES += ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} +XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_HB_TARGET_SOURCES} #XML target types merge script XMLTOHB_TARGET_MERGE_SCRIPT = updatetargetxml.pl @@ -89,15 +88,16 @@ GENFILES = ${XMLTOHB_TARGETS} # @echo XMLTOHB_HB_TARGET_SOURCES = ${XMLTOHB_HB_TARGET_SOURCES} # @echo XMLTOHB_MERGED_COMMON_TARGET_SOURCES = ${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} # @echo VPATH = ${VPATH} - + EXTRA_PARTS = $(addprefix $(IMGDIR)/, $(XMLTOHB_SYSTEM_BINARIES)) -CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) \ - $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml}) \ - ${GENDIR}/${XMLTOHB_GENERIC_XML} ${GENDIR}/${XMLTOHB_FAPI_XML} \ - ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} \ - ${GENDIR}/errl/errludattribute.H \ - ${GENDIR}/errl/errludtarget.H +CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) +CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml}) +CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_GENERIC_XML} +CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_FAPI_XML} +CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} +CLEAN_TARGETS += ${GENDIR}/errl/errludattribute.H +CLEAN_TARGETS += ${GENDIR}/errl/errludtarget.H GENDIR_ERRL = $(ROOTPATH)/obj/genfiles/errl @@ -106,7 +106,7 @@ CLEAN_TARGETS += $(XMLTOHB_RAN_INDICATION) include ${ROOTPATH}/config.mk -# Delete any generated file on error +# Delete any generated file on error .DELETE_ON_ERROR: ${EXTRA_PARTS}: ${IMGDIR}/% : ${GENDIR}/% diff --git a/src/usr/testcore/lib/makefile b/src/usr/testcore/lib/makefile index e2516304e..6d2bcd41b 100644 --- a/src/usr/testcore/lib/makefile +++ b/src/usr/testcore/lib/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -25,6 +25,6 @@ ROOTPATH = ../../../.. MODULE = testsyslib TESTS = *.H -SUBDIRS = runtime.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/testcore/lib/runtime/makefile b/src/usr/testcore/lib/runtime/makefile index a745479fd..8fcdc55ac 100644 --- a/src/usr/testcore/lib/runtime/makefile +++ b/src/usr/testcore/lib/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -24,7 +24,8 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../../.. MODULE = testsyslib_rt -TESTCASES = stltest.H string.H +TESTCASES += stltest.H +TESTCASES += string.H TESTS = $(addprefix ../,$(TESTCASES)) include $(ROOTPATH)/config.mk diff --git a/src/usr/testcore/makefile b/src/usr/testcore/makefile index a11fbeb1a..4aa780f81 100644 --- a/src/usr/testcore/makefile +++ b/src/usr/testcore/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -22,7 +22,9 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../.. -SUBDIRS = lib.d kernel.d rtloader.d +SUBDIRS += lib.d +SUBDIRS += kernel.d +SUBDIRS += rtloader.d include ${ROOTPATH}/config.mk diff --git a/src/usr/trace/daemon/makefile b/src/usr/trace/daemon/makefile index 325810b77..b89f52bbb 100644 --- a/src/usr/trace/daemon/makefile +++ b/src/usr/trace/daemon/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2012 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -23,7 +23,8 @@ ROOTPATH = ../../../.. MODULE = tracedaemon -OBJS = daemon.o complist.o +OBJS += daemon.o +OBJS += complist.o #SUBDIRS = test.d diff --git a/src/usr/trace/makefile b/src/usr/trace/makefile index 6195ae522..2a04e71da 100644 --- a/src/usr/trace/makefile +++ b/src/usr/trace/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -23,9 +23,17 @@ ROOTPATH = ../../.. MODULE = trace -OBJS = interface.o service.o compdesc.o buffer.o bufferpage.o daemonif.o \ - debug.o assert.o +OBJS += interface.o +OBJS += service.o +OBJS += compdesc.o +OBJS += buffer.o +OBJS += bufferpage.o +OBJS += daemonif.o +OBJS += debug.o +OBJS += assert.o -SUBDIRS = daemon.d test.d runtime.d +SUBDIRS += daemon.d +SUBDIRS += test.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/trace/runtime/makefile b/src/usr/trace/runtime/makefile index 6c4f21407..4c78f5531 100644 --- a/src/usr/trace/runtime/makefile +++ b/src/usr/trace/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -24,7 +24,10 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = trace_rt -OBJS = interface.o assert.o compdesc.o rt_service.o +OBJS += interface.o +OBJS += assert.o +OBJS += compdesc.o +OBJS += rt_service.o VPATH += .. include $(ROOTPATH)/config.mk diff --git a/src/usr/util/makefile b/src/usr/util/makefile index f8018dcd9..087b5c6bd 100644 --- a/src/usr/util/makefile +++ b/src/usr/util/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -23,9 +23,14 @@ ROOTPATH = ../../.. MODULE = util -OBJS = threadpool.o utilbase.o utilstream.o utilmem.o utilfile.o \ - utillidmgr.o +OBJS += threadpool.o +OBJS += utilbase.o +OBJS += utilstream.o +OBJS += utilmem.o +OBJS += utilfile.o +OBJS += utillidmgr.o -SUBDIRS = test.d runtime.d +SUBDIRS += test.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/util/runtime/makefile b/src/usr/util/runtime/makefile index b27eaf55f..e91b19337 100644 --- a/src/usr/util/runtime/makefile +++ b/src/usr/util/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -24,9 +24,12 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = util_rt -OBJS = utilbase.o utilstream.o utilmem.o utillidmgr_rt.o +OBJS += utilbase.o +OBJS += utilstream.o +OBJS += utilmem.o +OBJS += utillidmgr_rt.o -SUBDIRS = test.d +SUBDIRS += test.d VPATH += .. include $(ROOTPATH)/config.mk diff --git a/src/usr/vfs/makefile b/src/usr/vfs/makefile index 69d0f53a2..1ac7eb23b 100644 --- a/src/usr/vfs/makefile +++ b/src/usr/vfs/makefile @@ -1,30 +1,30 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/vfs/makefile $ +# $Source: src/usr/vfs/makefile $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2014 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG ROOTPATH = ../../.. MODULE = vfs -OBJS = vfsrp.o +OBJS += vfsrp.o -SUBDIRS = test.d +SUBDIRS += test.d include ${ROOTPATH}/config.mk diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile index 5bfffa8ef..d41d50744 100644 --- a/src/usr/vpd/makefile +++ b/src/usr/vpd/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012,2013 +# COPYRIGHT International Business Machines Corp. 2012,2014 # # p1 # @@ -27,9 +27,12 @@ MODULE = vpd include vpd.mk #include unique objects -OBJS += vpd.o dimmPres.o rtvpd_load.o +OBJS += vpd.o +OBJS += dimmPres.o +OBJS += rtvpd_load.o -SUBDIRS = test.d runtime.d +SUBDIRS += test.d +SUBDIRS += runtime.d BINARY_FILES = $(IMGDIR)/dimmspd.dat:3a9f53e3684e57401ed0aed75f25980fca99f40b BINARY_FILES += $(IMGDIR)/procmvpd.dat:7dabbe4879dcdd19ed236573aa68e8671fa8c3c7 diff --git a/src/usr/vpd/runtime/makefile b/src/usr/vpd/runtime/makefile index bb8d04ffe..f1ba47e42 100644 --- a/src/usr/vpd/runtime/makefile +++ b/src/usr/vpd/runtime/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -31,7 +31,7 @@ include ../vpd.mk #add unique object modules OBJS += rt_vpd.o -SUBDIRS = test.d +SUBDIRS += test.d VPATH += .. diff --git a/src/usr/vpd/vpd.mk b/src/usr/vpd/vpd.mk index 2c6617ddb..d973c9718 100644 --- a/src/usr/vpd/vpd.mk +++ b/src/usr/vpd/vpd.mk @@ -21,4 +21,8 @@ # # IBM_PROLOG_END_TAG # common objects with runtime -OBJS = ipvpd.o mvpd.o cvpd.o spd.o errlud_vpd.o +OBJS += ipvpd.o +OBJS += mvpd.o +OBJS += cvpd.o +OBJS += spd.o +OBJS += errlud_vpd.o diff --git a/src/usr/xscom/makefile b/src/usr/xscom/makefile index 89ead1946..ccf91f316 100644 --- a/src/usr/xscom/makefile +++ b/src/usr/xscom/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -23,8 +23,10 @@ ROOTPATH = ../../.. MODULE = xscom -OBJS = xscom.o piberror.o +OBJS += xscom.o +OBJS += piberror.o -SUBDIRS = test.d runtime.d +SUBDIRS += test.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/xscom/runtime/makefile b/src/usr/xscom/runtime/makefile index a534fc13b..91a374ac2 100644 --- a/src/usr/xscom/runtime/makefile +++ b/src/usr/xscom/runtime/makefile @@ -24,9 +24,10 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = xscom_rt -OBJS = rt_xscom.o piberror.o +OBJS += rt_xscom.o +OBJS += piberror.o -SUBDIRS = test.d +SUBDIRS += test.d VPATH += .. include $(ROOTPATH)/config.mk |
