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>

2 files changed, 14 insertions, 30 deletions

diff --git a/sbe/image/Makefile b/sbe/image/Makefile
index 206dfad0..f09bffbe 100644
--- a/sbe/image/Makefile
+++ b/sbe/image/Makefile
@@ -123,7 +123,7 @@ SIMICS_PPETRACEPP_TAR_FILES += $(PK_SRCDIR)/trace/pk_trace.h
 SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_ROOT_DIR)/sbe/sbefw/plugins/sbeUserDataParser.C
 SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_ROOT_DIR)/sbe/sbefw/sbeFFDCType.H
 
-SBE_TOOLS := $(TOOLS_IMAGE_DIR)/sbe_default_tool
+SBE_TOOLS := $(BASE_OBJDIR)/sbe_default_tool
 
 P9_XIP_TOOL := $(P9_XIP_BINDIR)/p9_xip_tool
 
@@ -295,7 +295,7 @@ $(SUBDIRS):
 
 
 #Build the SBE XIP Tools
-$(SBE_TOOLS):
+$(SBE_TOOLS): $(P9_XIP_TOOL)
 	$(MAKE) -C $(TOOLS_IMAGE_DIR) -f Makefile
 
 # Build the P9-XIP Tool
@@ -306,7 +306,7 @@ normalize: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin
 	$(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin normalize
 
 defaultset: $(SBE_TOOLS) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin normalize
-	$(TOOLS_ATTR_DIR)/ppeSetFixed.pl $(TOOLS_IMAGE_DIR) $(BASE_OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
+	$(TOOLS_ATTR_DIR)/ppeSetFixed.pl $(BASE_OBJDIR) $(BASE_OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
 
 # Build the trace utilities
 ppe_trace_bin:
@@ -339,8 +339,6 @@ tracehash:
 clean:
 	rm -fr $(OBJDIR)
 	rm -f $(TOP-FIXED-HEADERS)
-	$(MAKE) -C $(TOOLS_IMAGE_DIR) -f Makefile clean
-	$(MAKE) -C $(P9_XIP_SRCDIR) -f Makefile clean
 	rm -f collect_reg_ffdc.H hwp_return_codes.H hwp_error_info.H hwp_ffdc_classes.H collect_reg_ffdc.C set_sbe_error.H sbe_build_info.H
 	rm -f $(GEN-CREATEATTRGETSETMACROS)
 	rm -f $(GEN-PARSEATTRIBUTEINFO)
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*