Merge pull request #857 from e-liner/attribute
Adding support for additional attribute files in P9
diff --git a/openpower/package/witherspoon-xml/witherspoon.mk b/openpower/package/witherspoon-xml/witherspoon.mk
index b378c26..db4b764 100644
--- a/openpower/package/witherspoon-xml/witherspoon.mk
+++ b/openpower/package/witherspoon-xml/witherspoon.mk
@@ -41,6 +41,7 @@
--tgt-xml $(MRW_HB_TOOLS)/target_types_merged.xml \
--tgt-xml $(MRW_HB_TOOLS)/target_types_hb.xml \
--tgt-xml $(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ --tgt-xml $(MRW_HB_TOOLS)/target_types_openpower.xml \
--mrw-xml $(MRW_SCRATCH)/WITHERSPOON_hb.mrw.xml
cp $(MRW_SCRATCH)/WITHERSPOON_hb.mrw.xml.updated $(MRW_SCRATCH)/WITHERSPOON_hb.mrw.xml
@@ -50,9 +51,11 @@
$(MRW_HB_TOOLS)/attribute_types.xml \
$(MRW_HB_TOOLS)/attribute_types_hb.xml \
$(MRW_HB_TOOLS)/attribute_types_oppowervm.xml \
+ $(MRW_HB_TOOLS)/attribute_types_openpower.xml \
$(MRW_HB_TOOLS)/target_types_merged.xml \
$(MRW_HB_TOOLS)/target_types_hb.xml \
$(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ $(MRW_HB_TOOLS)/target_types_openpower.xml \
$(MRW_SCRATCH)/$(BR2_WITHERSPOON_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
# creating the targeting binary
diff --git a/openpower/package/zaius-xml/zaius.mk b/openpower/package/zaius-xml/zaius.mk
index 14005dc..52c8850 100644
--- a/openpower/package/zaius-xml/zaius.mk
+++ b/openpower/package/zaius-xml/zaius.mk
@@ -42,6 +42,7 @@
--tgt-xml $(MRW_HB_TOOLS)/target_types_merged.xml \
--tgt-xml $(MRW_HB_TOOLS)/target_types_hb.xml \
--tgt-xml $(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ --tgt-xml $(MRW_HB_TOOLS)/target_types_openpower.xml \
--mrw-xml $(MRW_SCRATCH)/$(BR2_ZAIUS_MRW_XML_FILENAME)
cp $(MRW_SCRATCH)/$(BR2_ZAIUS_MRW_XML_FILENAME).updated \
@@ -52,9 +53,11 @@
$(MRW_HB_TOOLS)/attribute_types.xml \
$(MRW_HB_TOOLS)/attribute_types_hb.xml \
$(MRW_HB_TOOLS)/attribute_types_oppowervm.xml \
+ $(MRW_HB_TOOLS)/attribute_types_openpower.xml \
$(MRW_HB_TOOLS)/target_types_merged.xml \
$(MRW_HB_TOOLS)/target_types_hb.xml \
$(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ $(MRW_HB_TOOLS)/target_types_openpower.xml \
$(MRW_SCRATCH)/$(BR2_ZAIUS_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
# creating the targeting binary