diff options
| author | Raja Das <rajadas2@in.ibm.com> | 2016-02-09 03:10:11 -0600 |
|---|---|---|
| committer | AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com> | 2016-03-24 00:57:24 -0400 |
| commit | 9b222a06e7013429df09bf7ebbbaead076ad5acc (patch) | |
| tree | 61ba8d1d4c772ffcc0c0752616db44469afd6a69 /sbe/image | |
| parent | 19139d2eb05f1211bd21e5ee3689ae9a215cf0fc (diff) | |
| download | talos-sbe-9b222a06e7013429df09bf7ebbbaead076ad5acc.tar.gz talos-sbe-9b222a06e7013429df09bf7ebbbaead076ad5acc.zip | |
Get/Put Occ Sram Support
Change-Id: I8f4669bfbca3d58d8f55d5d115d370bfa99ae49d
RTC:128980
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/20658
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
Diffstat (limited to 'sbe/image')
| -rw-r--r-- | sbe/image/Makefile | 15 | ||||
| -rw-r--r-- | sbe/image/img_defs.mk | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile index da00f581..f42f82ed 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -110,11 +110,17 @@ SIMICS_PPE_TAR_FILES += $(OBJDIR)/../../tools/ppetracepp/ppe2fsp SIMICS_PPE_TAR_FILES += $(OBJDIR)/trexStringFile SIMICS_BB_TAR_FILES += $(OBJDIR)/../build/simics/* +# Common Pm libraries +PM_MAKE_DIR := $(PM_SRCDIR) +LIB_DIRS += -L$(OBJDIR)/pm +PMLIB := $(OBJDIR)/pm/libpm.a +LLIBS += -lpm + SBE_TOOLS := $(TOOLS_IMAGE_DIR)/sbe_default_tool P9_XIP_TOOL := $(P9_XIP_BINDIR)/p9_xip_tool -LINK_OBJS = $(OBJS) $(SBEFWLIB) $(PKLIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(HWPLIB) $(P2PLIB) $(PERVLIB) $(NESTLIB) +LINK_OBJS = $(OBJS) $(SBEFWLIB) $(PKLIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(HWPLIB) $(P2PLIB) $(PERVLIB) $(NESTLIB) $(PMLIB) # Define the objects OBJS := $(addprefix $(OBJDIR)/, $(TOP_OBJECTS)) @@ -256,7 +262,7 @@ $(OBJDIR): $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PPE_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) mkdir -p $(OBJDIR) -.PHONY: clean topfixedheaders $(PKLIB) $(P2PLIB) $(PPELIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(PERVLIB) $(NESTLIB) $(HWPLIB) buildInfo pibMemAttrSet +.PHONY: clean topfixedheaders $(PKLIB) $(P2PLIB) $(PPELIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(PERVLIB) $(NESTLIB) $(PMLIB) $(HWPLIB) buildInfo pibMemAttrSet #errxml: topfixedheaders attrids platattr attrserv @@ -306,6 +312,11 @@ $(NESTLIB): @echo "Processing nest makefile" $(MAKE) -I $(IMAGE_SRCDIR) -C $(NEST_MAKE_DIR) -f Makefile +#Build the pm code +$(PMLIB): + @echo "Processing pm makefile" + $(MAKE) -I $(IMAGE_SRCDIR) -C $(PM_MAKE_DIR) -f Makefile + #Build the HWP lib procedures $(HWPLIB): @echo "Processing HWP lib makefile" diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index ba883473..a9669af8 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -66,6 +66,10 @@ ifndef NEST_SRCDIR export NEST_SRCDIR = $(abspath ../../import/chips/p9/procedures/hwp/nest) endif +ifndef PM_SRCDIR +export PM_SRCDIR = $(abspath ../../import/chips/p9/procedures/hwp/pm) +endif + ifndef HWPLIB_SRCDIR export HWPLIB_SRCDIR = $(abspath ../../import/chips/p9/procedures/hwp/lib) endif @@ -79,7 +83,7 @@ export P9_XIP_BINDIR = $(P9_XIP_SRCDIR)/bin endif ifndef IMG_INCLUDES -export IMG_INCLUDES = -I$(P9_XIP_SRCDIR) -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) +export IMG_INCLUDES = -I$(P9_XIP_SRCDIR) -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) endif ifndef BASE_OBJDIR |
