diff options
| author | spashabk-in <shakeebbk@in.ibm.com> | 2017-06-23 01:48:59 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-06-30 12:18:41 -0400 |
| commit | d9b5ac11981194f9b3eeb850e853762bdee5e739 (patch) | |
| tree | ba8727809a3ba4c987396b093c86c52084186038 /src/build | |
| parent | ec4e890770270ff25f2b29c4338ba1b5eade5e84 (diff) | |
| download | talos-sbe-d9b5ac11981194f9b3eeb850e853762bdee5e739.tar.gz talos-sbe-d9b5ac11981194f9b3eeb850e853762bdee5e739.zip | |
Install DD2 only changes and support DD2 attrdump
Get 'make install_DD2' working without making DD1 before hand
cmvc-prereq:1027517
Change-Id: I5b64759bc3ffbe5ca16d677e28cb8f4433f4e700
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42345
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Diffstat (limited to 'src/build')
| -rw-r--r-- | src/build/Makefile | 25 | ||||
| -rw-r--r-- | src/build/img_defs.mk | 4 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/build/Makefile b/src/build/Makefile index b62287bb..f87c3aae 100644 --- a/src/build/Makefile +++ b/src/build/Makefile @@ -177,20 +177,19 @@ endif install: all tar tar: -# TODO:Remove this line once Simics supports DD specific files - @cp $(IMG_DIR)/sbe_seeprom_DD1.bin $(IMG_DIR)/sbe_seeprom.bin | true - @cp $(IMG_DIR)/sbeStringFile_DD1 $(IMG_DIR)/sbeStringFile | true + @cp $(IMG_DIR)/sbe_seeprom_DD1.bin $(IMG_DIR)/sbe_seeprom.bin || true + @cp $(IMG_DIR)/$(SBE_SYMBOLS_NAME) $(IMG_DIR)/sbeStringFile || true @echo "Installing simics.tar" - @rm -rf $(OBJDIR)/simics-tar-dir - @mkdir $(OBJDIR)/simics-tar-dir - @mkdir $(OBJDIR)/simics-tar-dir/ppetracepp - @mkdir $(OBJDIR)/simics-tar-dir/parserplugins - @cp $(SIMICS_PPE_TAR_FILES) $(OBJDIR)/simics-tar-dir - @cp $(SIMICS_BB_TAR_FILES) $(OBJDIR)/simics-tar-dir - @cp $(SIMICS_PPETRACEPP_TAR_FILES) $(OBJDIR)/simics-tar-dir/ppetracepp - @cp $(SIMICS_PARSERPLUGINS_TAR_FILES) $(OBJDIR)/simics-tar-dir/parserplugins - @cd $(OBJDIR)/simics-tar-dir && tar -cvf simics.tar * && mv simics.tar $(IMG_DIR) && cd .. - @rm -rf $(OBJDIR)/simics-tar-dir + @rm -rf $(TAR_OBJDIR) + @mkdir $(TAR_OBJDIR) + @mkdir $(TAR_OBJDIR)/ppetracepp + @mkdir $(TAR_OBJDIR)/parserplugins + @cp $(SIMICS_PPE_TAR_FILES) $(TAR_OBJDIR) + @cp $(SIMICS_BB_TAR_FILES) $(TAR_OBJDIR) + @cp $(SIMICS_PPETRACEPP_TAR_FILES) $(TAR_OBJDIR)/ppetracepp + @cp $(SIMICS_PARSERPLUGINS_TAR_FILES) $(TAR_OBJDIR)/parserplugins + @cd $(TAR_OBJDIR) && tar -cvf simics.tar * && mv simics.tar $(IMG_DIR) && cd .. + @rm -rf $(TAR_OBJDIR) @echo "Generated simics.tar in Sbe images Directory" .PHONY: all normalize defaultset appendloader add_LoaderAddr symbols report \ diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk index 220919a7..c56d321a 100644 --- a/src/build/img_defs.mk +++ b/src/build/img_defs.mk @@ -198,6 +198,10 @@ ifndef BASE_OBJDIR export BASE_OBJDIR = $(SBE_ROOT_DIR)/obj/$(IMAGE_SUFFIX) endif +ifndef TAR_OBJDIR +export TAR_OBJDIR = $(SBE_ROOT_DIR)/obj/simics-tar-dir +endif + ifndef P9_XIP_SRCDIR export P9_XIP_SRCDIR = $(IMPORT_SRCDIR)/chips/p9/xip endif |
