diff options
| author | Martin Peschke <mpeschke@de.ibm.com> | 2016-08-25 11:25:12 +0200 |
|---|---|---|
| committer | Jennifer A. Stofer <stofer@us.ibm.com> | 2016-08-26 10:39:05 -0400 |
| commit | a2769d835231dbf2b1442c84c4496db46803169c (patch) | |
| tree | dca0efa8d8456dcdad5b1ad53f3e59a7a8f055c8 /sbe | |
| parent | 9de6805a8c89513f6ffecadb17894aaf3142c5a8 (diff) | |
| download | talos-sbe-a2769d835231dbf2b1442c84c4496db46803169c.tar.gz talos-sbe-a2769d835231dbf2b1442c84c4496db46803169c.zip | |
P9-XIP: new binary output directory passed by SBE build flow
changed from import/chips/p9/xip/bin to sbe/obj/xip
Change-Id: I3b5c947bc3bbbdc4fb365515207376d53faa5798
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28775
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: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'sbe')
| -rw-r--r-- | sbe/image/Makefile | 2 | ||||
| -rw-r--r-- | sbe/image/img_defs.mk | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile index da380f06..206dfad0 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -300,7 +300,7 @@ $(SBE_TOOLS): # Build the P9-XIP Tool $(P9_XIP_TOOL): - $(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile #$(P9_XIP_TOOL) + $(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile BINDIR=$(P9_XIP_BINDIR) normalize: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin normalize diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index 0ef4108a..da8008d3 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -131,22 +131,22 @@ ifndef IMAGEPROCS_SRCDIR export IMAGEPROCS_SRCDIR = $(IMPORT_SRCDIR)/tools/imageProcs endif +ifndef BASE_OBJDIR +export BASE_OBJDIR = $(SBE_SRC_DIR)/obj +endif + ifndef P9_XIP_SRCDIR export P9_XIP_SRCDIR = $(IMPORT_SRCDIR)/chips/p9/xip endif ifndef P9_XIP_BINDIR -export P9_XIP_BINDIR = $(P9_XIP_SRCDIR)/bin +export P9_XIP_BINDIR = $(BASE_OBJDIR)/xip endif ifndef IMG_INCLUDES export IMG_INCLUDES = -I$(IMAGEPROCS_SRCDIR) -I$(P9_XIP_SRCDIR) -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(UTILS_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) -I$(INITFILES_SRCDIR) endif -ifndef BASE_OBJDIR -export BASE_OBJDIR = $(SBE_SRC_DIR)/obj -endif - export IMG_OBJDIR = $(BASE_OBJDIR)/$(IMAGE_SEEPROM_NAME) ifndef PK_SRCDIR |
