summaryrefslogtreecommitdiffstats
path: root/src/build/Makefile
diff options
context:
space:
mode:
authorkswaroop <krathmar@in.ibm.com>2019-04-11 05:00:37 -0500
committerRAJA DAS <rajadas2@in.ibm.com>2019-04-29 04:24:37 -0500
commit3f92b561d721a3fabfe0138f31707d522ec10392 (patch)
tree7ceeb6f73217b74a1306aa72b8022d1f5861a3d4 /src/build/Makefile
parent9c5d98ebc72bb37364eb0437f26c70f234af1f0f (diff)
downloadtalos-sbe-3f92b561d721a3fabfe0138f31707d522ec10392.tar.gz
talos-sbe-3f92b561d721a3fabfe0138f31707d522ec10392.zip
Fix for race condition while copying "p9_xip_tool"
Change-Id: Ia204d6e0e35f862db02210907e3f1819850cc930 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75868 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Diffstat (limited to 'src/build/Makefile')
-rw-r--r--src/build/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index 49dcb115..ea5d620d 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -210,6 +210,7 @@ add_LoaderAddr:
endif
tar:
+ @cp -f $(P9_XIP_TOOL) $(IMG_DIR)/
@cp $(IMG_DIR)/$(SBE_STRINGFILE_NAME) $(IMG_DIR)/sbeStringFile || true
@echo "Installing simics.tar"
@rm -rf $(TAR_OBJDIR)
@@ -304,13 +305,12 @@ $(SBE_IPL_TOOLS): $(P9_XIP_TOOL)
.NOTPARALLEL: $(P9_XIP_TOOL)
$(P9_XIP_TOOL):
$(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile BINDIR=$(P9_XIP_BINDIR) CXX_FLAGS=-D__PPE__=1
- cp -f $(P9_XIP_TOOL) $(IMG_DIR)/
normalize:
$(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_NAME).bin normalize
compress: $(IMG_DIR)/$(IMAGE_NAME).bin
- $(BOOT_SRCDIR)/sbeCompression.py -l $(IMG_DIR) -i $(IMAGE_NAME).bin
+ $(BOOT_SRCDIR)/sbeCompression.py -l $(IMG_DIR) -i $(IMAGE_NAME).bin -p $(P9_XIP_TOOL)
defaultset:
$(TOOLS_ATTR_DIR)/ppeSetFixed.pl $(IMG_DIR) $(IMG_DIR)/$(IMAGE_NAME).bin $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
OpenPOWER on IntegriCloud