diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-03-16 18:41:37 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-05-04 13:21:04 -0400 |
| commit | f3fb543c174c1492490add5cef5f730143ae2535 (patch) | |
| tree | a244f120565c6ba39ba5d9547dd8cf7d6e45671d /src/Makefile | |
| parent | db69c499974c1aaa961bfde439e2fd770123a27b (diff) | |
| download | talos-occ-f3fb543c174c1492490add5cef5f730143ae2535.tar.gz talos-occ-f3fb543c174c1492490add5cef5f730143ae2535.zip | |
Build full OCC image and update build process
Change-Id: I8e6d716a48f30021b653e850c74deb7526cfe293
RTC:133001
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22155
Tested-by: FSP CI Jenkins
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/Makefile')
| -rwxr-xr-x | src/Makefile | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/src/Makefile b/src/Makefile index b355147..7e62780 100755 --- a/src/Makefile +++ b/src/Makefile @@ -5,7 +5,7 @@ # # OpenPOWER OnChipController Project # -# Contributors Listed Below - COPYRIGHT 2014,2015 +# Contributors Listed Below - COPYRIGHT 2014,2016 # [+] International Business Machines Corp. # # @@ -46,28 +46,41 @@ THASH = $(PPETRACEPP_DIR)/tracehash.pl OCC_405_IMAGE_NAME = occ_405 OCC_GPE0_IMAGE_NAME = occ_gpe0 OCC_GPE1_IMAGE_NAME = occ_gpe1 +OCC_BOOTLOADER_DIR_NAME = occBootLoader +OCC_BOOTLOADER_NAME = bootloader +IMAGE_HDR_SCRIPT = imageHdrScript + +COMBINE_IMAGE_SUBDIRS = occBootLoader occ_405 occ_gpe0 occ_gpe1 +COMBINEIMAGE = $(MAKE) combineImage -C $(dir) +IMAGEFILE = $(OBJDIR)/image.bin NEEDED_IMAGES = \ $(TRACEPP_DIR)/tracepp \ + $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT) \ $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).out \ $(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).out \ - $(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).out - -#SIMICS_WS = /gsa/ausgsa/home/d/a/davidy/work/simics-ppeWork - -#default is to build images -needed_images: $(NEEDED_IMAGES) tracehash - -run: $(NEEDED_IMAGES) - $(SIMICS_WS)/simics \ - -e '$$occ_405_binary_to_load=$(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).out' \ - -e '$$occ_gpe0_binary_to_load=$(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).out' \ - -e '$$occ_gpe1_binary_to_load=$(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).out' \ - modelsetup.simics - - + $(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).out \ + $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(OCC_BOOTLOADER_NAME).out \ + +.PHONY : all +all: $(NEEDED_IMAGES) combineImage tracehash + +.PHONY : needed_images +needed_images: $(NEEDED_IMAGES) + +.PHONY : combineImage +combineImage: $(NEEDED_IMAGES) + rm -rf $(IMAGEFILE) + BASE_OBJDIR=$(BASE_OBJDIR) $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT) \ + $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(OCC_BOOTLOADER_NAME).bin \ + $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).bin \ + $(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).bin \ + $(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).bin \ + t2 \ + `md5sum $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).bin | cut -c 1-4` #clean the obj directory +.PHONY : clean clean: rm -fr $(OBJDIR) rm -f $(TRACEPP_DIR)/tracepp @@ -82,6 +95,9 @@ $(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).out: $(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).out: (cd $(SRCDIR)/$(OCC_GPE1_IMAGE_NAME) && make) +$(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(OCC_BOOTLOADER_NAME).out $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT): + (cd $(SRCDIR)/$(OCC_BOOTLOADER_DIR_NAME) && make) + $(TRACEPP_DIR)/tracepp: (cd $(TRACEPP_DIR) && make) |
