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 /tools/image | |
| 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 'tools/image')
| -rw-r--r-- | tools/image/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/image/Makefile b/tools/image/Makefile index 9a015590..c9229c2d 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,7 +33,8 @@ INCLUDES += -I ../../pk/kernel/ INCLUDES += -I ../../pk/std/ INCLUDES += -I ../../pk/trace/ INCLUDES += -I ../../tools/ppetracepp/ -INCLUDES += -I ../../import/hwpf/fapi2/include/ +INCLUDES += -I ../../importtemp/fapi2/include/plat +INCLUDES += -I ../../importtemp/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 @@ -57,7 +58,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 @@ -73,7 +74,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 $@ $< @@ -85,7 +86,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 |
