diff options
| author | Santosh Puranik <santosh.puranik@in.ibm.com> | 2015-11-06 00:30:41 -0600 |
|---|---|---|
| committer | Gregory S. Still <stillgs@us.ibm.com> | 2015-11-30 09:45:34 -0600 |
| commit | 20a4e0020c96a249b99d063aeae3469788114865 (patch) | |
| tree | 666fba80aa6a4651877c1100f1dd30fb1b493587 /sbe/image | |
| parent | 436b140d0252badbe665c7369e6d8d31c3719cff (diff) | |
| download | talos-sbe-20a4e0020c96a249b99d063aeae3469788114865.tar.gz talos-sbe-20a4e0020c96a249b99d063aeae3469788114865.zip | |
Revert "Revert "FAPI cleanup in PPE""
This reverts commit 55cbb4e99f0eba76f27eed20cf5f704e495a1158.
Change-Id: I9ffea263a80c5c6dabc1609a6e2ef7966f7e468d
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21804
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Diffstat (limited to 'sbe/image')
| -rw-r--r-- | sbe/image/img_defs.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index df06530a..95536fbc 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 ../../importtemp/fapi2) +export BASE_FAPI2_DIR = $(abspath ../../import/hwpf/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,7 +212,6 @@ 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) @@ -262,7 +261,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 @@ -272,7 +271,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 = |
