diff options
Diffstat (limited to 'src/usr/targeting')
5 files changed, 86 insertions, 9 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml new file mode 100644 index 000000000..e27aa1d61 --- /dev/null +++ b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml @@ -0,0 +1,35 @@ +<!-- IBM_PROLOG_BEGIN_TAG --> +<!-- This is an automatically generated prolog. --> +<!-- --> +<!-- $Source: src/usr/targeting/common/xmltohb/attribute_types_openpower.xml $ --> +<!-- --> +<!-- OpenPOWER HostBoot Project --> +<!-- --> +<!-- Contributors Listed Below - COPYRIGHT 2016 --> +<!-- [+] International Business Machines Corp. --> +<!-- --> +<!-- --> +<!-- Licensed under the Apache License, Version 2.0 (the "License"); --> +<!-- you may not use this file except in compliance with the License. --> +<!-- You may obtain a copy of the License at --> +<!-- --> +<!-- http://www.apache.org/licenses/LICENSE-2.0 --> +<!-- --> +<!-- Unless required by applicable law or agreed to in writing, software --> +<!-- distributed under the License is distributed on an "AS IS" BASIS, --> +<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or --> +<!-- implied. See the License for the specific language governing --> +<!-- permissions and limitations under the License. --> +<!-- --> +<!-- IBM_PROLOG_END_TAG --> +<attributes> + +<!-- ===================================================================== + Contains the definition of attributes that are only available on + openpower systems. This file is only compiled when + CONFIG_XML_INCLUDE_OPENPOWER is set to true and is always false on + FSP based systems. + ===================================================================== +--> + +</attributes> diff --git a/src/usr/targeting/common/xmltohb/attribute_types_oppowervm.xml b/src/usr/targeting/common/xmltohb/attribute_types_oppowervm.xml index cce48d219..f54c2d2f4 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_oppowervm.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_oppowervm.xml @@ -26,8 +26,8 @@ <!-- ===================================================================== Contains the definition of attributes that are only available on - openpower systems. This file is only compiled when - CONFIG_XML_INCLUDE_OPENPOWER is set to true and is always false on + openpower systems for a PowerVM build. This file is only compiled when + CONFIG_XML_INCLUDE_OPPOWERVM is set to true and is always false on FSP based systems. ===================================================================== --> diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml new file mode 100644 index 000000000..625be4dbb --- /dev/null +++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml @@ -0,0 +1,35 @@ +<!-- IBM_PROLOG_BEGIN_TAG --> +<!-- This is an automatically generated prolog. --> +<!-- --> +<!-- $Source: src/usr/targeting/common/xmltohb/target_types_openpower.xml $ --> +<!-- --> +<!-- OpenPOWER HostBoot Project --> +<!-- --> +<!-- Contributors Listed Below - COPYRIGHT 2016 --> +<!-- [+] International Business Machines Corp. --> +<!-- --> +<!-- --> +<!-- Licensed under the Apache License, Version 2.0 (the "License"); --> +<!-- you may not use this file except in compliance with the License. --> +<!-- You may obtain a copy of the License at --> +<!-- --> +<!-- http://www.apache.org/licenses/LICENSE-2.0 --> +<!-- --> +<!-- Unless required by applicable law or agreed to in writing, software --> +<!-- distributed under the License is distributed on an "AS IS" BASIS, --> +<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or --> +<!-- implied. See the License for the specific language governing --> +<!-- permissions and limitations under the License. --> +<!-- --> +<!-- IBM_PROLOG_END_TAG --> +<attributes> + +<!-- ===================================================================== + Contains the target definition of attributes that are only available + on openpower systems. This file is only compiled when + CONFIG_XML_INCLUDE_OPENPOWER is set to true and is always false on + FSP based systems. + ===================================================================== + --> + +</attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types_oppowervm.xml b/src/usr/targeting/common/xmltohb/target_types_oppowervm.xml index 9274ac9ce..33f5b85df 100644 --- a/src/usr/targeting/common/xmltohb/target_types_oppowervm.xml +++ b/src/usr/targeting/common/xmltohb/target_types_oppowervm.xml @@ -26,8 +26,8 @@ <!-- ===================================================================== Contains the target definition of attributes that are only available - on openpower systems. This file is only compiled when - CONFIG_XML_INCLUDE_OPENPOWER is set to true and is always false on + on openpower systems for a PowerVM build. This file is only compiled when + CONFIG_XML_INCLUDE_OPPOWERVM is set to true and is always false on FSP based systems. ===================================================================== --> diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index bea46f4c9..feeb9c20b 100644 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -77,26 +77,33 @@ XMLTOHB_COMMON_TARGET_SOURCES = target_types.xml XMLTOHB_HB_ATTRIBUTE_SOURCES = attribute_types_hb.xml XMLTOHB_HB_TARGET_SOURCES = target_types_hb.xml +# attribute files that are only included in power vm build. +XMLTOHB_OPPOWERVM_ATTRIBUTE_SOURCES = attribute_types_oppowervm.xml +XMLTOHB_OPPOWERVM_TARGET_SOURCES = target_types_oppowervm.xml + # attribute files that are only included in openpower build. -XMLTOHB_OPENPOWER_ATTRIBUTE_SOURCES = attribute_types_oppowervm.xml -XMLTOHB_OPENPOWER_TARGET_SOURCES = target_types_oppowervm.xml +XMLTOHB_OPENPOWER_ATTRIBUTE_SOURCES = attribute_types_openpower.xml +XMLTOHB_OPENPOWER_TARGET_SOURCES = target_types_openpower.xml XMLTOHB_MERGED_COMMON_TARGET_SOURCES = target_types_merged.xml # The customize target file combines all targetTypeExtension files before # combining them with the common target_types.xml file. To include a new file, -# just add it to the XMLTOHB_TARGET_SOURCES +# just add it to the XMLTOHB_TARGET_SOURCES. XMLTOHB_CUSTOMIZE_TARGET_SOURCES = target_types_customize.xml -XMLTOHB_TARGET_SOURCES += target_types_hb.xml -XMLTOHB_TARGET_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPENPOWER), target_types_oppowervm.xml) +XMLTOHB_TARGET_SOURCES += ${XMLTOHB_HB_TARGET_SOURCES} +XMLTOHB_TARGET_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPPOWERVM),${XMLTOHB_OPPOWERVM_TARGET_SOURCES}) +XMLTOHB_TARGET_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPENPOWER),${XMLTOHB_OPENPOWER_TARGET_SOURCES}) #Define XMLTOHB_GENERIC_SOURCES XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_COMMON_ATTRIBUTE_SOURCES} XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_HB_ATTRIBUTE_SOURCES} +XMLTOHB_GENERIC_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPPOWERVM),${XMLTOHB_OPPOWERVM_ATTRIBUTE_SOURCES}) XMLTOHB_GENERIC_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPENPOWER),${XMLTOHB_OPENPOWER_ATTRIBUTE_SOURCES}) XMLTOHB_GENERIC_SOURCES += ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_HB_TARGET_SOURCES} +XMLTOHB_GENERIC_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPPOWERVM),${XMLTOHB_OPPOWERVM_TARGET_SOURCES}) XMLTOHB_GENERIC_SOURCES += $(if $(CONFIG_INCLUDE_XML_OPENPOWER),${XMLTOHB_OPENPOWER_TARGET_SOURCES}) TEMP_DEFAULT_SOURCES = tempdefaults.xml |