summaryrefslogtreecommitdiffstats
path: root/src/occ_405/img_defs.mk
diff options
context:
space:
mode:
authorWilliam Bryan <wilbryan@us.ibm.com>2016-07-26 15:02:15 -0500
committerWilliam A. Bryan <wilbryan@us.ibm.com>2016-07-29 15:05:27 -0400
commit9ad0d6f666fcd2392a5d6d3634df82264a5729eb (patch)
tree97a99d6aa273436c55a30ce5db064f59b141b0c8 /src/occ_405/img_defs.mk
parenta545aa59ce8788c4bfe6fd9bb2f64413bff47189 (diff)
downloadtalos-occ-9ad0d6f666fcd2392a5d6d3634df82264a5729eb.tar.gz
talos-occ-9ad0d6f666fcd2392a5d6d3634df82264a5729eb.zip
Delete unused files, update PK, and use new compilers
Change-Id: I9e4951a2cebd204d1ea752c63e3f2b532ad3a2db Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27465 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Wael El-Essawy <welessa@us.ibm.com>
Diffstat (limited to 'src/occ_405/img_defs.mk')
-rw-r--r--src/occ_405/img_defs.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/occ_405/img_defs.mk b/src/occ_405/img_defs.mk
index 3029079..bdcc2d9 100644
--- a/src/occ_405/img_defs.mk
+++ b/src/occ_405/img_defs.mk
@@ -113,20 +113,24 @@ ifndef PPETRACEPP_DIR
export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp)
endif
+ifndef PPETOOLS_OBJDIR
+export PPETOOLS_OBJDIR = $(abspath ../obj/ppetools)
+endif
+
ifndef TRACEPP_DIR
export TRACEPP_DIR = $(abspath ../tracepp)
endif
CC_ASM = $(GCC-TOOL-PREFIX)gcc
-TCC = $(PPETRACEPP_DIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
-THCC = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc
+TCC = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
+THCC = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc
CC = $(GCC-TOOL-PREFIX)gcc
AS = $(GCC-TOOL-PREFIX)as
AR = $(GCC-TOOL-PREFIX)ar
LD = $(GCC-TOOL-PREFIX)ld
OBJDUMP = $(GCC-TOOL-PREFIX)objdump
OBJCOPY = $(GCC-TOOL-PREFIX)objcopy
-TCPP = $(PPETRACEPP_DIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
+TCPP = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
THASH = $(PPETRACEPP_DIR)/tracehash.pl
CPP = $(GCC-TOOL-PREFIX)cpp
@@ -154,8 +158,6 @@ ifeq "$(SSX_THREAD_SUPPORT)" ""
SSX_THREAD_SUPPORT = 1
endif
-# TODO: Enable this once we get MMU support working in simics
-# Currently, turning on MMU support causes an SSX panic (in Simics)
ifeq "$(PPC405_MMU_SUPPORT)" ""
PPC405_MMU_SUPPORT = 1
endif
OpenPOWER on IntegriCloud