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/occ_405/img_defs.mk | |
| 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/occ_405/img_defs.mk')
| -rw-r--r-- | src/occ_405/img_defs.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/occ_405/img_defs.mk b/src/occ_405/img_defs.mk index da22314..3029079 100644 --- a/src/occ_405/img_defs.mk +++ b/src/occ_405/img_defs.mk @@ -5,7 +5,7 @@ # # OpenPOWER OnChipController Project # -# Contributors Listed Below - COPYRIGHT 2015 +# Contributors Listed Below - COPYRIGHT 2015,2016 # [+] International Business Machines Corp. # # @@ -138,6 +138,13 @@ endif OBJDIR = $(IMG_OBJDIR)$(SUB_OBJDIR) +ifndef BOOTLOADER_OBJDIR +export BOOTLOADER_OBJDIR = $(BASE_OBJDIR)/occBootLoader +endif + +ifndef IMGHDRSCRIPT +export IMGHDRSCRIPT = $(BOOTLOADER_OBJDIR)/imageHdrScript +endif ifeq "$(SSX_TIMER_SUPPORT)" "" SSX_TIMER_SUPPORT = 1 @@ -181,6 +188,12 @@ else GCC-DEFS += -DTRAC_TO_SIMICS=0 endif +ifdef SIMICS_ENVIRONMENT +GCC-DEFS += -DSIMICS_ENVIRONMENT=$(SIMICS_ENVIRONMENT) +else +GCC-DEFS += -DSIMICS_ENVIRONMENT=1 +endif + GCC-DEFS += -DIMAGE_NAME=$(IMAGE_NAME) GCC-DEFS += -DSSX_TIMER_SUPPORT=$(SSX_TIMER_SUPPORT) GCC-DEFS += -DSSX_THREAD_SUPPORT=$(SSX_THREAD_SUPPORT) |
