From 2cfe6c7ba51244b27cff78a4e62b55ed8aa74efd Mon Sep 17 00:00:00 2001
From: Derk Rembold <rembold@de.ibm.com>
Date: Wed, 22 Jul 2015 14:41:16 +0200
Subject: added nest compilation

Change-Id: Ib35a7e5a13ff7384f483f68b6f376774f7a10607
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19238
Reviewed-by: GIRISANKAR PAULRAJ <gpaulraj@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Derk Rembold <rembold@de.ibm.com>
Tested-by: Derk Rembold <rembold@de.ibm.com>
---
 hwp/nest/nestfiles.mk |  2 +-
 sbe/image/Makefile    | 15 +++++++++++++--
 sbe/image/img_defs.mk |  6 +++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/hwp/nest/nestfiles.mk b/hwp/nest/nestfiles.mk
index aa2abc12..a2512371 100644
--- a/hwp/nest/nestfiles.mk
+++ b/hwp/nest/nestfiles.mk
@@ -14,7 +14,7 @@
 
 NEST-CPP-SOURCES = p9_sbe_mcs_setup.C
 NEST-CPP-SOURCES +=p9_sbe_scominit.C
-NEST-CPP-SOURCES +=p9_sbe_fabricinit.C
+#NEST-CPP-SOURCES +=p9_sbe_fabricinit.C
 
 NEST-C-SOURCES =
 NEST-S-SOURCES =
diff --git a/sbe/image/Makefile b/sbe/image/Makefile
index 80efb5eb..9ba3dab7 100644
--- a/sbe/image/Makefile
+++ b/sbe/image/Makefile
@@ -75,9 +75,15 @@ LIB_DIRS += -L$(OBJDIR)/perv
 PERVLIB := $(OBJDIR)/perv/libperv.a
 LLIBS += -lperv
 
+# Common Nest libraries
+NEST_MAKE_DIR := $(NEST_SRCDIR)
+LIB_DIRS += -L$(OBJDIR)/nest
+NESTLIB := $(OBJDIR)/nest/libnest.a
+LLIBS += -lnest
+
 SBE_TOOLS := $(TOOLS_IMAGE_DIR)/sbe_xip_tool $(TOOLS_IMAGE_DIR)/sbe_default_tool
 
-LINK_OBJS = $(OBJS) $(SBEFWLIB) $(PKLIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(HWPLIB) $(P2PLIB) $(PERVLIB)
+LINK_OBJS = $(OBJS) $(SBEFWLIB) $(PKLIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(HWPLIB) $(P2PLIB) $(PERVLIB) $(NESTLIB)
 
 # Define the objects
 OBJS := $(addprefix $(OBJDIR)/, $(TOP_OBJECTS))
@@ -154,7 +160,7 @@ $(OBJDIR):
 	$(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PPE_FAPI2_DIR)/include $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
 	mkdir -p $(OBJDIR)
 
-.PHONY: clean topfixedheaders $(PKLIB) $(P2PLIB) $(PPELIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(PERVLIB) $(HWPLIB)
+.PHONY: clean topfixedheaders $(PKLIB) $(P2PLIB) $(PPELIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(PERVLIB) $(NESTLIB) $(HWPLIB)
 
 topfixedheaders:
 	$(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
@@ -201,6 +207,11 @@ $(PERVLIB):
 	@echo "Processing perv makefile"
 	$(MAKE) -I $(IMAGE_SRCDIR) -C $(PERV_MAKE_DIR) -f Makefile
 
+#Build the nest code
+$(NESTLIB):
+	@echo "Processing nest makefile"
+	$(MAKE) -I $(IMAGE_SRCDIR) -C $(NEST_MAKE_DIR) -f Makefile
+
 #Build the comming HWP lib procedures
 $(HWPLIB):
 	@echo "Processing HWP lib makefile"
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk
index 3be16a72..00cdbe35 100644
--- a/sbe/image/img_defs.mk
+++ b/sbe/image/img_defs.mk
@@ -54,12 +54,16 @@ ifndef PERV_SRCDIR
 export PERV_SRCDIR = $(abspath ../../hwp/perv)
 endif
 
+ifndef NEST_SRCDIR
+export NEST_SRCDIR = $(abspath ../../hwp/nest)
+endif
+
 ifndef HWPLIB_SRCDIR
 export HWPLIB_SRCDIR = $(abspath ../../hwp/lib)
 endif
 
 ifndef IMG_INCLUDES
-export IMG_INCLUDES = -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR)
+export IMG_INCLUDES = -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR)
 endif
 ifndef BASE_OBJDIR
 export BASE_OBJDIR = $(abspath ../obj)
-- 
cgit v1.2.1