diff options
author | Raja Das <rajadas2@in.ibm.com> | 2016-10-17 00:25:08 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-10-27 12:43:09 -0400 |
commit | 18735b7c9abd821d4c9ed829923a493f59df700f (patch) | |
tree | 079a9e401bfbbe21d5a2f457cc9e6dfcd1f64d2a /src | |
parent | d728390807854a30c1e6246a55c8b31943dcaeec (diff) | |
download | talos-sbe-18735b7c9abd821d4c9ed829923a493f59df700f.tar.gz talos-sbe-18735b7c9abd821d4c9ed829923a493f59df700f.zip |
SBE Makefile cleanup for hwp/lib directory
Change-Id: I6610811d30d19248c0ccf40f48fceb06db95c0b5
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31315
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.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: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/build/Makefile | 5 | ||||
-rw-r--r-- | src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk | 1 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/hwp/lib/Makefile | 54 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk | 42 |
4 files changed, 0 insertions, 102 deletions
diff --git a/src/build/Makefile b/src/build/Makefile index 53147a58..3fad7ef5 100644 --- a/src/build/Makefile +++ b/src/build/Makefile @@ -49,11 +49,6 @@ LIB_DIRS += -L$(OBJDIR)/fapi2 FAPI2LIB := $(OBJDIR)/fapi2/libfapi2.a LLIBS += -lfapi2 -# HWP LIB library -SUBDIRS += $(HWPLIB_SRCDIR) -LIB_DIRS += -L$(OBJDIR)/lib -HWPLIB := $(OBJDIR)/libcommon.a -LLIBS += -lcommon include $(HWPERR_SRCDIR)/hwpErrors.mk # Common Utils library diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk index 4c8afec4..e5a2df55 100644 --- a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk +++ b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk @@ -35,7 +35,6 @@ ISTEPCOMMON-CPP-SOURCES +=p9_sbe_gear_switcher.C ISTEPCOMMON-CPP-SOURCES +=p9_sbe_check_master_stop15.C ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C ISTEPCOMMON-CPP-SOURCES +=p9_thread_control.C -ISTEPCOMMON-CPP-SOURCES +=p9_common_pro_epi_log.C ISTEPCOMMON-CPP-SOURCES +=p9_fbc_utils.C ISTEPCOMMON-CPP-SOURCES +=p9_sbe_load_bootloader.C ISTEPCOMMON-CPP-SOURCES +=p9_pba_access.C diff --git a/src/import/chips/p9/procedures/hwp/lib/Makefile b/src/import/chips/p9/procedures/hwp/lib/Makefile deleted file mode 100644 index 6bff4cf0..00000000 --- a/src/import/chips/p9/procedures/hwp/lib/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/import/chips/p9/procedures/hwp/lib/Makefile $ -# -# OpenPOWER sbe Project -# -# Contributors Listed Below - COPYRIGHT 2015,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 - -# This Makefile compiles all of the common library hardware procedure code. -# See the "libcommonfiles.mk" file in this directory. - -#all generated files from this makefile will end up in obj/lib -export SUB_OBJDIR = /lib - -include img_defs.mk -include libcommonfiles.mk - - -OBJS := $(addprefix $(OBJDIR)/, $(LIB_OBJECTS)) - -libcommon.a: lib - $(AR) crs $(OBJDIR)/libcommon.a $(OBJDIR)/*.o - -.PHONY: clean lib -lib: $(OBJS) - -$(OBJS) $(OBJS:.o=.d): | $(OBJDIR) - -$(OBJDIR): - mkdir -p $(OBJDIR) - -clean: - rm -fr $(OBJDIR) - -ifneq ($(MAKECMDGOALS),clean) -include $(OBJS:.o=.d) -endif diff --git a/src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk b/src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk deleted file mode 100644 index e20c8579..00000000 --- a/src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk +++ /dev/null @@ -1,42 +0,0 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk $ -# -# OpenPOWER sbe Project -# -# Contributors Listed Below - COPYRIGHT 2015,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 libcommonfiles.mk -# -# @brief mk for including library common object files -# -########################################################################## -# Object Files -########################################################################## - -LIB-CPP-SOURCES += p9_common_poweronoff.C -LIB-CPP-SOURCES += p9_common_pro_epi_log.C - -LIB-C-SOURCES += -LIB-S-SOURCES += - -LIB_OBJECTS += $(LIB-CPP-SOURCES:.C=.o) -LIB_OBJECTS += $(LIB-C-SOURCES:.c=.o) -LIB_OBJECTS += $(LIB-S-SOURCES:.S=.o) - |