diff options
| author | Joe McGill <jmcgill@us.ibm.com> | 2016-05-03 19:25:09 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-05-06 03:28:26 -0400 |
| commit | 9f1b774d571fec417188b5912b01e1edd22da345 (patch) | |
| tree | 0dc400bdeef822aade713704b634ab9021ffdd00 /sbe/image | |
| parent | 77135f0bbfbf78b35f3106275a8f00b8b846c62a (diff) | |
| download | talos-sbe-9f1b774d571fec417188b5912b01e1edd22da345.tar.gz talos-sbe-9f1b774d571fec417188b5912b01e1edd22da345.zip | |
Infrastructure updates to build cache initfile HWPs in import tree
Change-Id: Ia31cc98769d5ca0ad52150aca693a9fa9b20e0c1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24045
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'sbe/image')
| -rw-r--r-- | sbe/image/Makefile | 16 | ||||
| -rw-r--r-- | sbe/image/img_defs.mk | 6 |
2 files changed, 19 insertions, 3 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile index 738c0c21..73624663 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -93,6 +93,13 @@ LIB_DIRS += -L$(OBJDIR)/nest NESTLIB := $(OBJDIR)/nest/libnest.a LLIBS += -lnest +# Initfiles library +INITFILES_MAKE_DIR := $(INITFILES_SRCDIR) +LIB_DIRS += -L$(OBJDIR)/initfiles +INITFILESLIB := $(OBJDIR)/initfiles/libinitfiles.a +LLIBS += -linitfiles + + SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SBE_NAME).out SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SBE_NAME).map SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SBE_NAME).dis @@ -120,7 +127,7 @@ 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) $(PMLIB) +LINK_OBJS = $(OBJS) $(SBEFWLIB) $(PKLIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(HWPLIB) $(P2PLIB) $(PERVLIB) $(NESTLIB) $(PMLIB) $(INITFILESLIB) # Define the objects OBJS := $(addprefix $(OBJDIR)/, $(TOP_OBJECTS)) @@ -281,7 +288,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) $(PMLIB) $(HWPLIB) buildInfo +.PHONY: clean topfixedheaders $(PKLIB) $(P2PLIB) $(PPELIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(PERVLIB) $(NESTLIB) $(PMLIB) $(HWPLIB) $(INITFILESLIB) buildInfo #errxml: topfixedheaders attrids platattr attrserv @@ -336,6 +343,11 @@ $(PMLIB): @echo "Processing pm makefile" $(MAKE) -I $(IMAGE_SRCDIR) -C $(PM_MAKE_DIR) -f Makefile +#Build the initfiles +$(INITFILESLIB): + @echo "Processing initfiles makefile" + $(MAKE) -I $(IMAGE_SRCDIR) -C $(INITFILES_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 a9abecad..78e816a2 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -71,6 +71,10 @@ ifndef PM_SRCDIR export PM_SRCDIR = $(abspath ../../import/chips/p9/procedures/hwp/pm) endif +ifndef INITFILES_SRCDIR +export INITFILES_SRCDIR = $(abspath ../../import/chips/p9/procedures/hwp/initfiles) +endif + ifndef HWPLIB_SRCDIR export HWPLIB_SRCDIR = $(abspath ../../import/chips/p9/procedures/hwp/lib) endif @@ -88,7 +92,7 @@ export P9_XIP_BINDIR = $(P9_XIP_SRCDIR)/bin endif ifndef IMG_INCLUDES -export IMG_INCLUDES = -I$(IMAGEPROCS_SRCDIR) -I$(P9_XIP_SRCDIR) -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) +export IMG_INCLUDES = -I$(IMAGEPROCS_SRCDIR) -I$(P9_XIP_SRCDIR) -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) -I$(INITFILES_SRCDIR) endif ifndef BASE_OBJDIR |
