diff options
| author | Martin Peschke <mpeschke@de.ibm.com> | 2015-11-05 07:27:29 -0500 |
|---|---|---|
| committer | Martin Peschke <mpeschke@de.ibm.com> | 2015-11-05 06:39:53 -0600 |
| commit | aeab2730d48435cada4a3c30a0552f33cfdaa96c (patch) | |
| tree | b5bc4b7b5d90a490ca5ac8258079ddf6152ccce0 /sbe | |
| parent | 1bfd1c30b8c3ddd6db9491a638d4d9e55d72c1fb (diff) | |
| download | talos-sbe-aeab2730d48435cada4a3c30a0552f33cfdaa96c.tar.gz talos-sbe-aeab2730d48435cada4a3c30a0552f33cfdaa96c.zip | |
Revert "FAPI cleanup in PPE"
This reverts commit b267f6014899a92bdde19d4034c6c4d992d828ea.
Reverting on Santosh's request, because this patch needs follow-up patches, which can not be merged promptly, in order not to break SBE tests.
Change-Id: Ieaee095b76925b10b99deb6ac61be25d5b79ea4a
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21771
Tested-by: Jenkins Server
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Diffstat (limited to 'sbe')
| -rw-r--r-- | sbe/image/img_defs.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index 95536fbc..df06530a 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -8,10 +8,10 @@ # # PK : Default ..; The path to the PK source code. # The default is set for building the PK -# subdirectories. +# subdirectories. # # PK_THREAD_SUPPORT : (0/1, default 1); Compile PK thread and -# semaphore suppprt +# semaphore suppprt # # PK_TIMER_SUPPORT : (0/1, default 1); Compile PK timer suppprt # @@ -22,7 +22,7 @@ # make GCC-O-LEVEL="-Os -fno-branch-count-reg" # # GCC-TOOL-PREFIX : The full path (including executable file prefixes) to -# the GCC cross-development tools to use. The default is +# the GCC cross-development tools to use. The default is # "ppcnf-mcp5-" # # CTEPATH : This variable defaults to the afs/awd CTE tool @@ -113,7 +113,7 @@ export PPE_FAPI2_DIR = $(abspath ../../hwpf) endif ifndef BASE_FAPI2_DIR -export BASE_FAPI2_DIR = $(abspath ../../import/hwpf/fapi2) +export BASE_FAPI2_DIR = $(abspath ../../importtemp/fapi2) endif ifndef CC_ROOT @@ -185,8 +185,8 @@ GCC-O-LEVEL = -O endif GCC-DEFS += -DIMAGE_NAME=$(IMAGE_SEEPROM_NAME) -GCC-DEFS += -DPK_TIMER_SUPPORT=$(PK_TIMER_SUPPORT) -GCC-DEFS += -DPK_THREAD_SUPPORT=$(PK_THREAD_SUPPORT) +GCC-DEFS += -DPK_TIMER_SUPPORT=$(PK_TIMER_SUPPORT) +GCC-DEFS += -DPK_THREAD_SUPPORT=$(PK_THREAD_SUPPORT) GCC-DEFS += -DPK_TRACE_SUPPORT=$(PK_TRACE_SUPPORT) GCC-DEFS += -DPK_TRACE_HASH_PREFIX=$(PK_TRACE_HASH_PREFIX) GCC-DEFS += -DUSE_PK_APP_CFG_H=1 @@ -212,6 +212,7 @@ INCLUDES += -I$(PLAT_FAPI2_DIR)/include/plat INCLUDES += -I$(PLAT_FAPI2_DIR)/include INCLUDES += -I$(PPE_FAPI2_DIR)/include/plat INCLUDES += -I$(PPE_FAPI2_DIR)/include +INCLUDES += -I$(BASE_FAPI2_DIR)/include/plat INCLUDES += -I$(BASE_FAPI2_DIR)/include INCLUDES += -I$(PK_SRCDIR)/../include INCLUDES += -I$(PK_SRCDIR)/$(PPE_TYPE) @@ -261,7 +262,7 @@ GCC-CFLAGS += -ffixed-cr5 GCC-CFLAGS += -ffixed-cr6 GCC-CFLAGS += -ffixed-cr7 -CFLAGS = +CFLAGS = PPE-CFLAGS = $(CFLAGS) -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES) CPPFLAGS = -E -std=c++11 @@ -271,7 +272,7 @@ ASFLAGS = -mppe42 ifdef P2P_ENABLE #use this to disable optimizations (fused compare/branch etc.) -PCP-FLAG = +PCP-FLAG = #use this to enable optimizations #PCP-FLAG = |
