diff options
| author | Martin Peschke <mpeschke@de.ibm.com> | 2016-08-22 10:08:53 +0200 |
|---|---|---|
| committer | Jennifer A. Stofer <stofer@us.ibm.com> | 2016-08-26 10:39:25 -0400 |
| commit | 301e127c5c436dbdd1fc405d5f97ede495c2bf07 (patch) | |
| tree | 737b94b32b6762853cf20f324e80dac7e28f181e /tools | |
| parent | a2769d835231dbf2b1442c84c4496db46803169c (diff) | |
| download | talos-sbe-301e127c5c436dbdd1fc405d5f97ede495c2bf07.tar.gz talos-sbe-301e127c5c436dbdd1fc405d5f97ede495c2bf07.zip | |
sbe_default_tool: Makefile cleanup
Built files now go to ppe's general obj directory.
Do not build P9-XIP. Get the Makefile dependencies right instead.
Change-Id: I363128f207d3faf621f756d8db45165767e74ea1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28593
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/image/Makefile | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/tools/image/Makefile b/tools/image/Makefile index d4fed9a7..b6164213 100644 --- a/tools/image/Makefile +++ b/tools/image/Makefile @@ -29,11 +29,11 @@ # Make targets: -# all : +# all : utilities # # utilities : Build utility programs and procedures # -# clean : Removes the bin/ directory and all symbolic links +# clean : Removes generated files # ############################################################################ @@ -44,9 +44,6 @@ $(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/ @@ -82,42 +79,31 @@ GCC-VERSION = $(shell gcc -v 2>&1 | grep "$(GCC-RELEASE)") ifeq ($(GCC-VERSION),) $(error wrong compiler version. Use $(GCC-RELEASE) compiler. Try: "scl enable devtoolset-2 bash") else -CC = gcc CXX = g++ endif UTILITIES-SOURCES = sbe_default_tool.c - UTILITIES = sbe_default_tool # Utility targets -UTILITIES-OBJc = $(patsubst %.c,bin/%.o,$(UTILITIES-SOURCES)) -UTILITIES-OBJECTS += $(patsubst %.C,bin/%.o,$(UTILITIES-OBJc)) +UTILITIES-OBJc = $(patsubst %.c,$(BASE_OBJDIR)/%.o,$(UTILITIES-SOURCES)) +UTILITIES-OBJECTS += $(patsubst %.C,$(BASE_OBJDIR)/%.o,$(UTILITIES-OBJc)) UTILITIES-DEPENDENCIES = $(patsubst %.o,%.d,$(UTILITIES-OBJECTS)) -UTILITIES-EXECUTABLES = $(patsubst %,bin/%,$(UTILITIES)) - +UTILITIES-EXECUTABLES = $(patsubst %,$(BASE_OBJDIR)/%,$(UTILITIES)) -.PHONY : utilities buildBinDir -utilities: buildBinDir $(UTILITIES-EXECUTABLES) +.PHONY : all utilities clean -buildBinDir: - mkdir -p bin +all: utilities -# Build the P9-XIP image code -$(P9_XIP_BINDIR)/p9_xip_image.o: - $(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile +utilities: $(UTILITIES-EXECUTABLES) -CXXFLAGS+=-DDEBUG_SBE_XIP_IMAGE=1 CXXFLAGS+=-DFAPI2_NO_FFDC -bin/%.o: %.c +$(BASE_OBJDIR)/%.o: %.c $(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -c -o $@ $< -bin/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o bin/sbe_default_tool.o +$(BASE_OBJDIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/sbe_default_tool.o $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ - ln -sf bin/sbe_default_tool sbe_default_tool clean: - rm -f sbe_default_tool - rm -rf bin - mkdir -p bin + rm -f $(BASE_OBJDIR)/sbe_default_tool* |
