diff options
author | kswaroop <krathmar@in.ibm.com> | 2019-04-11 05:00:37 -0500 |
---|---|---|
committer | RAJA DAS <rajadas2@in.ibm.com> | 2019-04-29 04:24:37 -0500 |
commit | 3f92b561d721a3fabfe0138f31707d522ec10392 (patch) | |
tree | 7ceeb6f73217b74a1306aa72b8022d1f5861a3d4 /src/build | |
parent | 9c5d98ebc72bb37364eb0437f26c70f234af1f0f (diff) | |
download | talos-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')
-rw-r--r-- | src/build/Makefile | 4 | ||||
-rw-r--r-- | src/build/power_axone_defs.mk | 2 | ||||
-rw-r--r-- | src/build/power_defs.mk | 2 |
3 files changed, 4 insertions, 4 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) diff --git a/src/build/power_axone_defs.mk b/src/build/power_axone_defs.mk index 284c326b..6f6fd12e 100644 --- a/src/build/power_axone_defs.mk +++ b/src/build/power_axone_defs.mk @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2017,2018 +# Contributors Listed Below - COPYRIGHT 2017,2019 # [+] International Business Machines Corp. # # diff --git a/src/build/power_defs.mk b/src/build/power_defs.mk index c17598dc..6d368ec3 100644 --- a/src/build/power_defs.mk +++ b/src/build/power_defs.mk @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2017,2018 +# Contributors Listed Below - COPYRIGHT 2017,2019 # [+] International Business Machines Corp. # # |