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 /tools/image/Makefile | |
| 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 'tools/image/Makefile')
| -rw-r--r-- | tools/image/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/image/Makefile b/tools/image/Makefile index c9229c2d..9a015590 100644 --- a/tools/image/Makefile +++ b/tools/image/Makefile @@ -5,7 +5,7 @@ # Make targets: -# all : +# all : # # utilities : Build utility programs and procedures # @@ -21,7 +21,7 @@ CTEPATH = /afs/awd/projects/cte endif # Locations of required headers. -INCLUDES += -I. -I../../ -I../../utils +INCLUDES += -I. -I../../ -I../../utils INCLUDES += -I ../../sbe/image/ INCLUDES += -I ../../sbe/sbefw/ INCLUDES += -I ../../sbe/hwpf/include/plat @@ -33,8 +33,7 @@ INCLUDES += -I ../../pk/kernel/ INCLUDES += -I ../../pk/std/ INCLUDES += -I ../../pk/trace/ INCLUDES += -I ../../tools/ppetracepp/ -INCLUDES += -I ../../importtemp/fapi2/include/plat -INCLUDES += -I ../../importtemp/fapi2/include/ +INCLUDES += -I ../../import/hwpf/fapi2/include/ # Under Linux the scheme is to use a common compiler to create procedures. # However, the common compiler can be VERY slow, so if the system compiler is @@ -58,7 +57,7 @@ CC = gcc CXX = g++ endif -#UTILITIES-SOURCES += ../../sbe/image/sbe_xip_image.c +#UTILITIES-SOURCES += ../../sbe/image/sbe_xip_image.c UTILITIES-SOURCES = sbe_xip_tool.c sbe_default_tool.c UTILITIES = sbe_xip_tool sbe_default_tool @@ -74,7 +73,7 @@ UTILITIES-EXECUTABLES = $(patsubst %,bin/%,$(UTILITIES)) utilities: buildBinDir $(UTILITIES-EXECUTABLES) buildBinDir: - mkdir -p bin + mkdir -p bin bin/%.o: %.c $(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -DDEBUG_SBE_XIP_IMAGE=1 -DFAPI2_NO_FFDC -c -o $@ $< @@ -86,7 +85,7 @@ bin/sbe_xip_tool: bin/sbe_xip_image.o bin/p9_ring_identification.o bin/sbe_xip_t $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ ln -sf bin/sbe_xip_tool sbe_xip_tool -bin/sbe_default_tool: bin/sbe_xip_image.o bin/sbe_default_tool.o +bin/sbe_default_tool: bin/sbe_xip_image.o bin/sbe_default_tool.o $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ ln -sf bin/sbe_default_tool sbe_default_tool |
