diff options
Diffstat (limited to 'src/usr/targeting/common')
| -rw-r--r-- | src/usr/targeting/common/common.mk | 46 | ||||
| -rw-r--r-- | src/usr/targeting/common/test/common.mk | 38 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/common.mk | 119 |
3 files changed, 97 insertions, 106 deletions
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} |
