diff options
| author | Martin Peschke <mpeschke@de.ibm.com> | 2016-01-05 12:33:52 +0100 |
|---|---|---|
| committer | Martin Peschke <mpeschke@de.ibm.com> | 2016-01-21 06:55:10 -0600 |
| commit | 7c6b4af8ea3632e9f8d115d31302626bc9c76cd6 (patch) | |
| tree | 9b56c03a5da4a0a099325a5e4d29eaf1359346dd /tools/image/Makefile | |
| parent | 1366580dec312e84acfaf85dd8397abf4e328d36 (diff) | |
| download | talos-sbe-7c6b4af8ea3632e9f8d115d31302626bc9c76cd6.tar.gz talos-sbe-7c6b4af8ea3632e9f8d115d31302626bc9c76cd6.zip | |
P9-XIP: SBE IPL image build now shares P9-XIP code with ekb repo
All users of the P9-XIP headers and code have been changed to use
the P9-XIP code imported from ekb. The SBE IPL Image build flow
has been adapted to the new location of the P9-XIP code.
Some renaming was needed (SBE XIP -> P9-XIP), too.
Change-Id: Ia68cfe7c3599f8b4364778158731f91097ea466f
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23025
Tested-by: Jenkins Server
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Diffstat (limited to 'tools/image/Makefile')
| -rw-r--r-- | tools/image/Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/image/Makefile b/tools/image/Makefile index 9a015590..b946acd4 100644 --- a/tools/image/Makefile +++ b/tools/image/Makefile @@ -20,6 +20,9 @@ $(warning CTEPATH not defined; defaulting to awd) CTEPATH = /afs/awd/projects/cte endif +P9_XIP_SRCDIR = $(abspath ../../import/chips/p9/xip) +P9_XIP_BINDIR = $(P9_XIP_SRCDIR)/bin + # Locations of required headers. INCLUDES += -I. -I../../ -I../../utils INCLUDES += -I ../../sbe/image/ @@ -34,6 +37,7 @@ INCLUDES += -I ../../pk/std/ INCLUDES += -I ../../pk/trace/ INCLUDES += -I ../../tools/ppetracepp/ INCLUDES += -I ../../import/hwpf/fapi2/include/ +INCLUDES += -I ../../import/chips/p9/xip/ # 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,10 +61,9 @@ CC = gcc CXX = g++ endif -#UTILITIES-SOURCES += ../../sbe/image/sbe_xip_image.c -UTILITIES-SOURCES = sbe_xip_tool.c sbe_default_tool.c +UTILITIES-SOURCES = sbe_default_tool.c -UTILITIES = sbe_xip_tool sbe_default_tool +UTILITIES = sbe_default_tool # Utility targets UTILITIES-OBJc = $(patsubst %.c,bin/%.o,$(UTILITIES-SOURCES)) @@ -75,21 +78,18 @@ utilities: buildBinDir $(UTILITIES-EXECUTABLES) buildBinDir: mkdir -p bin -bin/%.o: %.c - $(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -DDEBUG_SBE_XIP_IMAGE=1 -DFAPI2_NO_FFDC -c -o $@ $< +# Build the P9-XIP image code +$(P9_XIP_BINDIR)/p9_xip_image.o: + $(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile -bin/sbe_xip_image.o: ../../sbe/image/sbe_xip_image.c +bin/%.o: %.c $(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -DDEBUG_SBE_XIP_IMAGE=1 -DFAPI2_NO_FFDC -c -o $@ $< -bin/sbe_xip_tool: bin/sbe_xip_image.o bin/p9_ring_identification.o bin/sbe_xip_tool.o - $(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: $(P9_XIP_BINDIR)/p9_xip_image.o bin/sbe_default_tool.o $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ ln -sf bin/sbe_default_tool sbe_default_tool clean: - rm -f sbe_xip_tool sbe_default_tool + rm -f sbe_default_tool rm -rf bin mkdir -p bin |
