Merge remote-tracking branch 'remotes/upstream/master'
diff --git a/openpower/package/p9dsu-xml/Config.in b/openpower/package/p9dsu-xml/Config.in
new file mode 100644
index 0000000..587a749
--- /dev/null
+++ b/openpower/package/p9dsu-xml/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_P9DSU_XML
+ bool "p9dsu_xml"
+ default y if (BR2_OPENPOWER_CONFIG_NAME = "p9dsu")
+ help
+ Utilites for building xml and the targeting binary image
+
+config BR2_P9DSU_SYSTEM_XML_FILENAME
+ string "Witherspoon targeting system xml filename"
+ default ""
+ help
+ Defines the name of the system XML filename to be used when creating targeting binary image
+
+config BR2_P9DSU_MRW_XML_FILENAME
+ string "Witherspoon targeting mrw xml filename"
+ default ""
+ help
+ Defines the name of the mrw XML filename to be used when creating targeting binary image
+
+config BR2_P9DSU_BIOS_XML_FILENAME
+ string "Witherspoon BIOS metadata XML filename"
+ default ""
+ help
+ Defines the name of the BIOS XML filename to parse when generating BIOS metadata
diff --git a/openpower/package/p9dsu-xml/p9dsu.mk b/openpower/package/p9dsu-xml/p9dsu.mk
new file mode 100644
index 0000000..d1214a7
--- /dev/null
+++ b/openpower/package/p9dsu-xml/p9dsu.mk
@@ -0,0 +1,92 @@
+################################################################################
+#
+# p9dsu_xml
+#
+################################################################################
+
+P9DSU_XML_VERSION ?= d429ddccae90d79769e4a0b5c8e07e37aa3edef5
+P9DSU_XML_SITE ?= $(call github,open-power,p9dsu-xml,$(P9DSU_XML_VERSION))
+
+P9DSU_XML_LICENSE = Apache-2.0
+P9DSU_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+
+P9DSU_XML_INSTALL_IMAGES = YES
+P9DSU_XML_INSTALL_TARGET = YES
+
+MRW_SCRATCH=$(STAGING_DIR)/openpower_mrw_scratch
+MRW_HB_TOOLS=$(STAGING_DIR)/hostboot_build_images
+
+# Defines for BIOS metadata creation
+BIOS_SCHEMA_FILE = $(MRW_HB_TOOLS)/bios.xsd
+P9DSU_BIOS_XML_CONFIG_FILE = $(MRW_SCRATCH)/$(BR2_P9DSU_BIOS_XML_FILENAME)
+BIOS_XML_METADATA_FILE = \
+ $(MRW_HB_TOOLS)/$(BR2_OPENPOWER_CONFIG_NAME)_bios_metadata.xml
+PETITBOOT_XSLT_FILE = $(MRW_HB_TOOLS)/bios_metadata_petitboot.xslt
+PETITBOOT_BIOS_XML_METADATA_FILE = \
+ $(MRW_HB_TOOLS)/$(BR2_OPENPOWER_CONFIG_NAME)_bios_metadata_petitboot.xml
+PETITBOOT_BIOS_XML_METADATA_INITRAMFS_FILE = \
+ $(TARGET_DIR)/usr/share/bios_metadata.xml
+
+define P9DSU_XML_BUILD_CMDS
+ # copy the p9dsu xml where the common lives
+ bash -c 'mkdir -p $(MRW_SCRATCH) && cp -r $(@D)/* $(MRW_SCRATCH)'
+
+ # generate the system mrw xml
+ perl -I $(MRW_HB_TOOLS) \
+ $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/p9dsu.xml
+
+ # filter out unwanted attributes
+ chmod +x $(MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl
+
+ $(MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl \
+ --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_P9DSU_MRW_XML_FILENAME)
+
+ cp $(MRW_SCRATCH)/$(BR2_P9DSU_MRW_XML_FILENAME).updated \
+ $(MRW_SCRATCH)/$(BR2_P9DSU_MRW_XML_FILENAME)
+
+ # merge in any system specific attributes, hostboot attributes
+ $(MRW_HB_TOOLS)/mergexml.sh $(MRW_SCRATCH)/$(BR2_P9DSU_SYSTEM_XML_FILENAME) \
+ $(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_P9DSU_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
+
+ # creating the targeting binary
+ $(MRW_HB_TOOLS)/xmltohb.pl \
+ --hb-xml-file=$(MRW_HB_TOOLS)/temporary_hb.hb.xml \
+ --fapi-attributes-xml-file=$(MRW_HB_TOOLS)/fapiattrs.xml \
+ --src-output-dir=none \
+ --img-output-dir=$(MRW_HB_TOOLS)/ \
+ --vmm-consts-file=$(MRW_HB_TOOLS)/vmmconst.h --noshort-enums \
+ --bios-xml-file=$(P9DSU_BIOS_XML_CONFIG_FILE) \
+ --bios-schema-file=$(BIOS_SCHEMA_FILE) \
+ --bios-output-file=$(BIOS_XML_METADATA_FILE)
+
+ # Transform BIOS XML into Petitboot specific BIOS XML via the schema
+ xsltproc -o \
+ $(PETITBOOT_BIOS_XML_METADATA_FILE) \
+ $(PETITBOOT_XSLT_FILE) \
+ $(BIOS_XML_METADATA_FILE)
+endef
+
+define P9DSU_XML_INSTALL_IMAGES_CMDS
+ mv $(MRW_HB_TOOLS)/targeting.bin $(MRW_HB_TOOLS)/$(BR2_OPENPOWER_TARGETING_BIN_FILENAME)
+endef
+
+define P9DSU_XML_INSTALL_TARGET_CMDS
+ # Install Petitboot specific BIOS XML into initramfs's usr/share/ dir
+ $(INSTALL) -D -m 0644 \
+ $(PETITBOOT_BIOS_XML_METADATA_FILE) \
+ $(PETITBOOT_BIOS_XML_METADATA_INITRAMFS_FILE)
+endef
+
+$(eval $(generic-package))