Enable WOFDATA generation
Enable WOFDATA generation for op-build by updating the makefiles to
use wof_data_xlator.pl script. The name of the input WOFDATA tar must
be unique to the MRW type (Everest-MRW.WofSetBins.tar.gz,
Rainier-2U-MRW.WofSetBins.tar.gz, Rainier-4U-MRW.WofSetBins.tar.gz).
Signed-off-by: chenduibm <duchen@us.ibm.com>
diff --git a/openpower/package/rainier-4u-xml/rainier-4u-xml.mk b/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
index abdb1eb..2e2a068 100644
--- a/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
+++ b/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
@@ -44,6 +44,8 @@
ifeq ($(BR2_RAINIER_4U_XML_TARGET_TYPES_OPENPOWER_XML),y)
RAINIER_4U_XML_TARGET_TYPES_OPENPOWER_XML = $(RAINIER_4U_XML_MRW_HB_TOOLS)/target_types_openpower.xml
endif
+WOF_TOOL = wof_data_xlator.pl
+WOF_BIN_OVERRIDE_LIST = wof_bins_for_override.txt
define RAINIER_4U_XML_FILTER_UNWANTED_ATTRIBUTES
chmod +x $(RAINIER_4U_XML_MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl
@@ -66,6 +68,12 @@
$(RAINIER_4U_XML_MRW_SCRATCH)/$(call qstrip,$(BR2_RAINIER_4U_XML_FILENAME))
$(INSTALL) -m 0644 -D $(@D)/$(call qstrip,$(BR2_RAINIER_4U_XML_BIOS_FILENAME)) \
$(RAINIER_4U_XML_MRW_SCRATCH)/$(call qstrip,$(BR2_RAINIER_4U_XML_BIOS_FILENAME))
+ $(eval WOF_SETS_DIR = $$(patsubst %.xml,%.WofSetBins,$(call qstrip,$(BR2_RAINIER_4U_XML_FILENAME))))
+ $(eval WOF_SETS_TAR = $(WOF_SETS_DIR).tar.gz)
+ if [ -e $(@D)/$(call qstrip,$(WOF_SETS_TAR)) ]; then \
+ $(INSTALL) -m 0644 -D $(@D)/$(call qstrip,$(WOF_SETS_TAR)) \
+ $(RAINIER_4U_XML_MRW_SCRATCH)/$(call qstrip,$(WOF_SETS_TAR)); \
+ fi
# generate the system mrw xml
perl -I $(RAINIER_4U_XML_MRW_HB_TOOLS) \
@@ -113,18 +121,19 @@
$(RAINIER_4U_XML_BIOS_METADATA_FILE)
# Create the wofdata
- if [ -e $(RAINIER_4U_XML_MRW_HB_TOOLS)/wof-tables-img ]; then \
- chmod +x $(RAINIER_4U_XML_MRW_HB_TOOLS)/wof-tables-img; \
+ if [ -e $(RAINIER_4U_XML_MRW_HB_TOOLS)/$(WOF_TOOL) ]; then \
+ chmod +x $(RAINIER_4U_XML_MRW_HB_TOOLS)/$(WOF_TOOL); \
fi
- if [ -d $(RAINIER_4U_XML_MRW_SCRATCH)/$(call qstrip, \
- $(BR2_RAINIER_4U_XML_FILENAME:.xml=.wofdata)) ]; then \
- $(RAINIER_4U_XML_MRW_HB_TOOLS)/wof-tables-img \
- --create $(RAINIER_4U_XML_MRW_SCRATCH)/$(call qstrip, \
- $(RAINIER_4U_XML_FILENAME:.xml=.wof_output)) \
- $(RAINIER_4U_XML_MRW_SCRATCH)/$(call qstrip, \
- $(BR2_RAINIER_4U_XML_FILENAME:.xml=wofdata)); \
- fi
+ # Create WOF override image
+ $(eval WOF_OVERRIDE_BIN = $$(patsubst %.xml,%.wofdata,$(call qstrip,$(BR2_RAINIER_4U_XML_FILENAME))))
+ if [ -e $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_SETS_TAR) ]; then \
+ rm $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_OVERRIDE_BIN); \
+ cd $(RAINIER_4U_XML_MRW_SCRATCH) && mkdir $(WOF_SETS_DIR); \
+ cd $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_SETS_DIR) && tar -xzvf $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_SETS_TAR); \
+ cd $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_SETS_DIR)/WofSetBins && ls | grep -i "\.bin" > $(WOF_BIN_OVERRIDE_LIST); \
+ cd $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_SETS_DIR)/WofSetBins && $(RAINIER_4U_XML_MRW_HB_TOOLS)/$(WOF_TOOL) --create $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_OVERRIDE_BIN) --combine $(RAINIER_4U_XML_MRW_SCRATCH)/$(WOF_SETS_DIR)/WofSetBins/$(WOF_BIN_OVERRIDE_LIST); \
+ fi
# Create the MEMD binary
if [ -e $(RAINIER_4U_XML_MRW_HB_TOOLS)/memd_creation.pl ]; then \