summaryrefslogtreecommitdiffstats
path: root/sbe/image/img_defs.mk
diff options
context:
space:
mode:
Diffstat (limited to 'sbe/image/img_defs.mk')
-rw-r--r--sbe/image/img_defs.mk18
1 files changed, 11 insertions, 7 deletions
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk
index de1be314..47ff6013 100644
--- a/sbe/image/img_defs.mk
+++ b/sbe/image/img_defs.mk
@@ -92,7 +92,15 @@ export IMPORT_SRCDIR = $(SBE_ROOT_DIR)/import
endif
ifndef TOOLS_SRCDIR
-export TOOLS_SRCDIR = $(SBE_ROOT_DIR)/tools
+export TOOLS_SRCDIR = $(SBE_SRC_DIR)/tools
+endif
+
+ifndef DEBUGTOOLS_SRCDIR
+export DEBUGTOOLS_SRCDIR = $(TOOLS_SRCDIR)/debug
+endif
+
+ifndef SIMICSTOOLS_SRCDIR
+export SIMICSTOOLS_SRCDIR = $(DEBUGTOOLS_SRCDIR)/simics
endif
ifndef UTILS_SRCDIR
@@ -151,10 +159,6 @@ 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
-
ifndef BOOT_OBJDIR
export BOOT_OBJDIR = $(BASE_OBJDIR)/boot
endif
@@ -187,7 +191,7 @@ export IMPORT_COMMON_DIR = $(IMPORT_SRCDIR)/chips/p9/common
endif
ifndef PPETRACEPP_DIR
-export PPETRACEPP_DIR = $(SBE_ROOT_DIR)/tools/ppetracepp
+export PPETRACEPP_DIR = $(TOOLS_SRCDIR)/ppetracepp
endif
ifndef PPETRACEPP_BIN_DIR
@@ -345,7 +349,7 @@ INCLUDES += -I$(PK_SRCDIR)/ppe42
INCLUDES += -I$(SBE_FW_DIR)
INCLUDES += -I$(BOOT_SRCDIR)
INCLUDES += -I$(PK_SRCDIR)/trace
-INCLUDES += -I$(SBE_ROOT_DIR)/tools/ppetracepp
+INCLUDES += -I$(PPETRACEPP_DIR)
INCLUDES += -I$(IMPORT_COMMON_DIR)/include
INCLUDES += -I$(IMPORT_UTILS_DIR)/imageProcs
INCLUDES += -I$(IMPORT_UTILS_DIR)/
OpenPOWER on IntegriCloud