From edec9bde06d4a3e1c06fc15c9312318b9324d94c Mon Sep 17 00:00:00 2001 From: Raja Das Date: Wed, 7 Sep 2016 01:00:13 -0500 Subject: Stop Clocks for MPIPL (Core & Cache(EQ)) RTC: 156382 Change-Id: Ib3e8c29467aa7d3b6b85286e6f5ce154f0f28ad6 RTC: 156382 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29555 Tested-by: Jenkins Server Reviewed-by: Shakeeb A. Pasha B K Reviewed-by: Sachin Gupta Tested-by: FSP CI Jenkins --- src/build/Makefile | 5 ++ src/build/img_defs.mk | 8 ++++ src/build/import_hwp_mk/istep2/Makefile | 2 +- src/build/import_hwp_mk/istep3/Makefile | 2 +- src/build/import_hwp_mk/istep4/Makefile | 2 +- src/build/import_hwp_mk/istep4/istep4files.mk | 1 + src/build/import_hwp_mk/istep5/Makefile | 2 +- src/build/import_hwp_mk/istepcommon/Makefile | 2 +- .../import_hwp_mk/istepcommon/istepcommonfiles.mk | 3 +- src/build/import_hwp_mk/istepmpipl/Makefile | 56 ++++++++++++++++++++++ .../import_hwp_mk/istepmpipl/istepmpiplfiles.mk | 41 ++++++++++++++++ src/build/linkerscripts/linkseeprom.cmd | 2 +- 12 files changed, 119 insertions(+), 7 deletions(-) create mode 100644 src/build/import_hwp_mk/istepmpipl/Makefile create mode 100644 src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk (limited to 'src/build') diff --git a/src/build/Makefile b/src/build/Makefile index 9bba17d6..1f7cdb6a 100644 --- a/src/build/Makefile +++ b/src/build/Makefile @@ -82,6 +82,11 @@ LIB_DIRS += -L$(OBJDIR-ISTEP5) ISTEP5LIB := $(OBJDIR-ISTEP5)/libistep5.a LLIBS += -listep5 +SUBDIRS += $(ISTEPMPIPL_INFRA_DIR) +LIB_DIRS += -L$(OBJDIR-ISTEPMPIPL) +ISTEPMPIPL := $(OBJDIR-ISTEPMPIPL)/libistepmpipl.a +LLIBS += -listepmpipl + SUBDIRS += $(ISTEPCOMMON_INFRA_DIR) LIB_DIRS += -L$(OBJDIR-ISTEPCOMMON) ISTEPCOMMON := $(OBJDIR-ISTEPCOMMON)/libistepcommon.a diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk index ec099f4b..9c7c53aa 100644 --- a/src/build/img_defs.mk +++ b/src/build/img_defs.mk @@ -107,6 +107,10 @@ ifndef ISTEP5_INFRA_DIR export ISTEP5_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep5 endif +ifndef ISTEPMPIPL_INFRA_DIR +export ISTEPMPIPL_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istepmpipl +endif + ifndef ISTEPCOMMON_INFRA_DIR export ISTEPCOMMON_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istepcommon endif @@ -272,6 +276,10 @@ ifndef OBJDIR-ISTEP5 export OBJDIR-ISTEP5 = $(BASE_OBJDIR)/istep5 endif +ifndef OBJDIR-ISTEPMPIPL +export OBJDIR-ISTEPMPIPL = $(BASE_OBJDIR)/istepmpipl +endif + ifndef OBJDIR-ISTEPCOMMON export OBJDIR-ISTEPCOMMON = $(BASE_OBJDIR)/istepcommon endif diff --git a/src/build/import_hwp_mk/istep2/Makefile b/src/build/import_hwp_mk/istep2/Makefile index fd9317f0..06c3ab0a 100644 --- a/src/build/import_hwp_mk/istep2/Makefile +++ b/src/build/import_hwp_mk/istep2/Makefile @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,7 +37,6 @@ GCC-CFLAGS += -mlongcall OBJSISTEP2 := $(addprefix $(OBJDIR-ISTEP2)/, $(ISTEP2_OBJECTS)) -#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all .PHONY: clean istep2 libistep2.a: istep2 diff --git a/src/build/import_hwp_mk/istep3/Makefile b/src/build/import_hwp_mk/istep3/Makefile index 8ea239c7..f692cf8c 100644 --- a/src/build/import_hwp_mk/istep3/Makefile +++ b/src/build/import_hwp_mk/istep3/Makefile @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,7 +37,6 @@ GCC-CFLAGS += -mlongcall OBJSISTEP3 := $(addprefix $(OBJDIR-ISTEP3)/, $(ISTEP3_OBJECTS)) -#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all .PHONY: clean istep3 libistep3.a: istep3 diff --git a/src/build/import_hwp_mk/istep4/Makefile b/src/build/import_hwp_mk/istep4/Makefile index 4dc34fed..882d47f6 100644 --- a/src/build/import_hwp_mk/istep4/Makefile +++ b/src/build/import_hwp_mk/istep4/Makefile @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,7 +37,6 @@ GCC-CFLAGS += -mlongcall OBJSISTEP4 := $(addprefix $(OBJDIR-ISTEP4)/, $(ISTEP4_OBJECTS)) -#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all .PHONY: clean istep4 libistep4.a: istep4 diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/istep4/istep4files.mk index de347d56..5fa151e0 100644 --- a/src/build/import_hwp_mk/istep4/istep4files.mk +++ b/src/build/import_hwp_mk/istep4/istep4files.mk @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/build/import_hwp_mk/istep5/Makefile b/src/build/import_hwp_mk/istep5/Makefile index e4b8eb3f..ee1f2b51 100644 --- a/src/build/import_hwp_mk/istep5/Makefile +++ b/src/build/import_hwp_mk/istep5/Makefile @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,7 +35,6 @@ export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM OBJSISTEP5 := $(addprefix $(OBJDIR-ISTEP5)/, $(ISTEP5_OBJECTS)) -#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all .PHONY: clean istep5 libistep5.a: istep5 diff --git a/src/build/import_hwp_mk/istepcommon/Makefile b/src/build/import_hwp_mk/istepcommon/Makefile index 645a3ce0..c4386526 100644 --- a/src/build/import_hwp_mk/istepcommon/Makefile +++ b/src/build/import_hwp_mk/istepcommon/Makefile @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,7 +35,6 @@ export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM OBJSISTEPCOMMON := $(addprefix $(OBJDIR-ISTEPCOMMON)/, $(ISTEPCOMMON_OBJECTS)) -#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all .PHONY: clean istepcommon libistepcommon.a: istepcommon diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk index 47505769..d93f768e 100644 --- a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk +++ b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +24,7 @@ # IBM_PROLOG_END_TAG # @file istepCommonfiles.mk # -# @brief mk for including istepCommon object files +# @brief mk for including istepcommon object files # ########################################################################## # Object Files diff --git a/src/build/import_hwp_mk/istepmpipl/Makefile b/src/build/import_hwp_mk/istepmpipl/Makefile new file mode 100644 index 00000000..d9822f90 --- /dev/null +++ b/src/build/import_hwp_mk/istepmpipl/Makefile @@ -0,0 +1,56 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/build/import_hwp_mk/istepmpipl/Makefile $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 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 +# This Makefile compiles all of the hardware procedure code. See the +# "*.mk" file in this directory. + +#all generated files from this makefile will end up in obj/* +export SUB_OBJDIR = /istepmpipl + +include img_defs.mk +include istepmpiplfiles.mk + +export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR) + +GCC-CFLAGS += -mlongcall + +OBJSISTEPMPIPL := $(addprefix $(OBJDIR-ISTEPMPIPL)/, $(ISTEPMPIPL_OBJECTS)) + +.PHONY: clean istepmpipl + +libistepmpipl.a: istepmpipl + $(AR) crs $(OBJDIR-ISTEPMPIPL)/libistepmpipl.a $(OBJDIR-ISTEPMPIPL)/*.o + +istepmpipl: $(OBJSISTEPMPIPL) + +$(OBJSISTEPMPIPL) $(OBJSISTEPMPIPL:.o=.d): | $(OBJDIR-ISTEPMPIPL) + +$(OBJDIR-ISTEPMPIPL): + mkdir -p $(OBJDIR-ISTEPMPIPL) + +clean: + rm -fr $(OBJDIR-ISTEPMPIPL) + +ifneq ($(MAKECMDGOALS),clean) +include $(OBJSISTEPMPIPL:.o=.d) +endif diff --git a/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk b/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk new file mode 100644 index 00000000..d2e99491 --- /dev/null +++ b/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk @@ -0,0 +1,41 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. +# +# +# 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 +# @file istepmpipl.mk +# +# @brief mk for including istepmpipl object files +# +########################################################################## +# Object Files +########################################################################## + +ISTEPMPIPL-CPP-SOURCES = p9_hcd_core_stopclocks.C +ISTEPMPIPL-CPP-SOURCES +=p9_hcd_cache_stopclocks.C +ISTEPMPIPL-CPP-SOURCES +=p9_hcd_l2_stopclocks.C +ISTEPMPIPL-C-SOURCES = +ISTEPMPIPL-S-SOURCES = + +ISTEPMPIPL_OBJECTS += $(ISTEPMPIPL-CPP-SOURCES:.C=.o) +ISTEPMPIPL_OBJECTS += $(ISTEPMPIPL-C-SOURCES:.c=.o) +ISTEPMPIPL_OBJECTS += $(ISTEPMPIPL-S-SOURCES:.S=.o) diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd index ad478996..cb006676 100644 --- a/src/build/linkerscripts/linkseeprom.cmd +++ b/src/build/linkerscripts/linkseeprom.cmd @@ -98,7 +98,7 @@ SECTIONS //////////////////////////////// .text ALIGN(8): { _text_origin = .; _text_offset = . - _seeprom_origin; - *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) } > seeprom + *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) } > seeprom _text_size = . - _text_origin; //////////////////////////////// -- cgit v1.2.1