summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspashabk-in <shakeebbk@in.ibm.com>2017-02-14 04:51:20 -0600
committerSachin Gupta <sgupta2m@in.ibm.com>2017-02-15 09:10:41 -0500
commitcb03acea61476cbda277e849b3e830ba0cef9091 (patch)
treeccaa2495232aa2a3d618b675eadda0ef27d2bda3
parentdb427bdb6a50395f2a61b71a85ae9715b1204a49 (diff)
downloadtalos-sbe-cb03acea61476cbda277e849b3e830ba0cef9091.tar.gz
talos-sbe-cb03acea61476cbda277e849b3e830ba0cef9091.zip
Errl parser fix and support to make DD1 and DD2 images separately
Supported rules: make DD1 -> build DD1 images make DD2 -> build DD2 images make all -> build all images make install_DD1 -> create simics tar for DD1 make install_DD2 -> create simics tar for DD2 make install -> create simics tar including all images Change-Id: I7eb62f2551d0ca8cf467270812df7da0c181d3af Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36416 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rw-r--r--Makefile11
-rw-r--r--src/build/Makefile3
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e4006cfb..7a634faf 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
#
# IBM_PROLOG_END_TAG
BUILD_DIR = src/build
-.PHONY: install all clean tar
+.PHONY: install all clean tar install_DD1 install_DD2 DD1 DD2
del_objects:
@rm -rf obj/sbefw
@@ -34,16 +34,19 @@ del_objects:
install: all tar
+install_DD1: DD1 tar
+install_DD2: DD2 tar
+
tar:
$(MAKE) -C $(BUILD_DIR) tar
-DD1_build:
+DD1:
$(MAKE) -C $(BUILD_DIR) all ddlevel=DD1
-DD2_build:
+DD2:
$(MAKE) -C $(BUILD_DIR) all ddlevel=DD2
-all: DD1_build del_objects DD2_build
+all: DD1 del_objects DD2
clean:
$(MAKE) -C $(BUILD_DIR) clean
diff --git a/src/build/Makefile b/src/build/Makefile
index d6576ee9..b6bcbea4 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -99,7 +99,7 @@ endif
SIMICS_PPE_TAR_FILES += $(IMG_DIR)/sbe_*.syms
SIMICS_PPE_TAR_FILES += $(TEST_SRCDIR)/*.xml
SIMICS_PPE_TAR_FILES += $(TEST_SRCDIR)/*.py
-SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(SBE_STRINGFILE_NAME)
+SIMICS_PPE_TAR_FILES += $(IMG_DIR)/sbeStringFile*
SIMICS_PPE_TAR_FILES += $(PPETRACEPP_BIN_DIR)/ppe2fsp
SIMICS_BB_TAR_FILES += $(SIMICSTOOLS_SRCDIR)/*
SIMICS_BB_TAR_FILES += $(DEBUGTOOLS_SRCDIR)/simics-debug-framework.py
@@ -179,6 +179,7 @@ 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
@echo "Installing simics.tar"
@rm -rf $(OBJDIR)/simics-tar-dir
@mkdir $(OBJDIR)/simics-tar-dir
OpenPOWER on IntegriCloud