diff options
author | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-09-24 08:09:28 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-11-09 23:58:28 -0500 |
commit | c3421af60e2153e39beba54578b2bafb4d3a219a (patch) | |
tree | 6adcb33fbd0f148446c807267f6a82fca81150dd | |
parent | 898712503096decf08879f87894d06796df8ffe9 (diff) | |
download | talos-sbe-c3421af60e2153e39beba54578b2bafb4d3a219a.tar.gz talos-sbe-c3421af60e2153e39beba54578b2bafb4d3a219a.zip |
Support for ipl build script for op-build
Change-Id: I6bc22b7606566ef40d875a9ee8a68de419a48143
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30268
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rw-r--r-- | src/build/Makefile | 10 | ||||
-rw-r--r-- | src/build/img_defs.mk | 11 | ||||
-rw-r--r-- | src/tools/iplbuild/Makefile | 82 |
3 files changed, 100 insertions, 3 deletions
diff --git a/src/build/Makefile b/src/build/Makefile index 3fad7ef5..d49d3572 100644 --- a/src/build/Makefile +++ b/src/build/Makefile @@ -113,6 +113,7 @@ SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/plugins/sbeUserDataParser.C SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/sbeFFDCType.H SBE_TOOLS := $(IMG_DIR)/sbe_default_tool +SBE_IPL_TOOLS := $(IMG_DIR)/p9_ipl_build P9_XIP_TOOL := $(P9_XIP_BINDIR)/p9_xip_tool @@ -167,8 +168,9 @@ all: $(OBJDIR) xml \ endif ifeq ($(img), seeprom) all: $(OBJDIR) xml $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin \ - $(SBE_TOOLS) normalize defaultset $(IMG_DIR)/fixed.bin appendloader \ - appendoverrides add_LoaderAddr symbols tracehash buildinfo report + $(SBE_TOOLS) $(SBE_IPL_TOOLS) normalize defaultset $(IMG_DIR)/fixed.bin \ + appendloader appendoverrides add_LoaderAddr symbols tracehash buildinfo \ + report endif install: all @@ -259,6 +261,10 @@ $(SUBDIRS): $(SBE_TOOLS): $(P9_XIP_TOOL) $(MAKE) -I $(INCLUDES) -C $(TOOLS_IMAGE_DIR) -f Makefile +#Build the IPL Build Tools +$(SBE_IPL_TOOLS): $(P9_XIP_TOOL) + $(MAKE) -I $(INCLUDES) -C $(IPL_BUILD_DIR) -f Makefile + # Build the P9-XIP Tool $(P9_XIP_TOOL): $(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile BINDIR=$(P9_XIP_BINDIR) diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk index 9c7c53aa..c580508f 100644 --- a/src/build/img_defs.mk +++ b/src/build/img_defs.mk @@ -175,8 +175,12 @@ ifndef HWPLIB_SRCDIR export HWPLIB_SRCDIR = $(IMPORT_SRCDIR)/chips/p9/procedures/hwp/lib endif +ifndef IMAGEPROCS_TOOL_DIR +export IMAGEPROCS_TOOL_DIR = $(IMPORT_SRCDIR)/tools/imageProcs +endif + ifndef IMAGEPROCS_SRCDIR -export IMAGEPROCS_SRCDIR = $(IMPORT_SRCDIR)/tools/imageProcs +export IMAGEPROCS_SRCDIR = $(IMPORT_SRCDIR)/chips/p9/utils/imageProcs endif ifndef BASE_OBJDIR @@ -224,6 +228,10 @@ ifndef TOOLS_IMAGE_DIR export TOOLS_IMAGE_DIR = $(TOOLS_SRCDIR)/image endif +ifndef IPL_BUILD_DIR +export IPL_BUILD_DIR = $(TOOLS_SRCDIR)/iplbuild +endif + ifndef IMPORT_XML_DIR export IMPORT_XML_DIR = $(IMPORT_SRCDIR)/chips/p9/procedures/xml endif @@ -434,6 +442,7 @@ INCLUDES += -I$(PPETRACEPP_DIR) INCLUDES += -I$(IMPORT_COMMON_DIR)/include INCLUDES += -I$(IMPORT_UTILS_DIR)/imageProcs INCLUDES += -I$(IMPORT_UTILS_DIR)/ +INCLUDES += -I$(IMPORT_SRCDIR)/tools/imageProcs GCC-CFLAGS += -Wall -Werror -Wno-unused-label GCC-CFLAGS += -msoft-float diff --git a/src/tools/iplbuild/Makefile b/src/tools/iplbuild/Makefile new file mode 100644 index 00000000..1acb04a8 --- /dev/null +++ b/src/tools/iplbuild/Makefile @@ -0,0 +1,82 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/tools/iplbuild/Makefile $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2015,2016 +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG +############################################################################ + +# Makefile for image tools +# works on X86 Linux hosts. + +# Make targets: + +# all : utilities +# +# utilities : Build utility programs and procedures +# +# clean : Removes generated files +# + +############################################################################ +include img_defs.mk + +GCC-RELEASE = 4.8.2 +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 +CXX = g++ +endif + +export VPATH = $(P9_XIP_SRCDIR):$(IMAGEPROCS_SRCDIR):$(IMAGEPROCS_TOOL_DIR) +export INCLUDES = -I$(P9_XIP_SRCDIR) \ + -I$(IMAGEPROCS_SRCDIR) \ + -I$(IMAGEPROCS_TOOL_DIR) +.PHONY : all utilities clean + +OBJS = $(P9_XIP_BINDIR)/p9_xip_image.o \ + $(BASE_OBJDIR)/tools/iplbuild/p9_ringId.o \ + $(BASE_OBJDIR)/tools/iplbuild/p9_tor.o \ + $(BASE_OBJDIR)/tools/iplbuild/p9_ipl_build.o \ + +all:objdir utilities + +objdir: + mkdir -p $(BASE_OBJDIR)/tools/iplbuild + +utilities: $(IMG_DIR)/p9_ipl_build + +CXXFLAGS =-DFAPI2_NO_FFDC -std=c++11 + +$(P9_XIP_BINDIR)/%.o: %.c + $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< + +$(BASE_OBJDIR)/tools/iplbuild/%.o: %.C + $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< + +$(IMG_DIR)/p9_ipl_build: $(OBJS) + $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ + +clean: + rm -rf $(BASE_OBJDIR)/tools/iplbuild + rm -f $(IMG_DIR)/p9_ipl_build |