summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSantosh Puranik <santosh.puranik@in.ibm.com>2016-09-08 06:38:00 -0500
committerSantosh S. Puranik <santosh.puranik@in.ibm.com>2016-09-19 01:43:56 -0400
commit420d37d4a25344e5a7ba31c3c150d08eccf331a4 (patch)
tree14877adbae94a9616b50d76f3fff9c9ed895d81f /src
parentbb215a103af37f8aed69ac9482fca7bfb022a066 (diff)
downloadtalos-sbe-420d37d4a25344e5a7ba31c3c150d08eccf331a4.tar.gz
talos-sbe-420d37d4a25344e5a7ba31c3c150d08eccf331a4.zip
Move FAPI generated files
-- Moved under obj/genfiles/ Change-Id: I184d4ac4579a1d711aaf22215d7fa915cfb67bf7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29369 Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com> 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: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/build/Makefile24
-rw-r--r--src/build/topfiles.mk54
-rw-r--r--src/hwpf/include/hwp_ffdc_classes.H24
3 files changed, 5 insertions, 97 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index fba611f8..d2f7d66f 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -30,9 +30,6 @@ include img_defs.mk
include $(BOOT_SRCDIR)/bootfiles.mk
include $(BUILDDATA_SRCDIR)/utils.mk
-#Pull in object file names for the top directory
-include topfiles.mk
-
SUBDIRS := $(PK_SRCDIR)/$(PPE_TYPE)
LIB_DIRS += -L$(OBJDIR)/pk
PKLIB := $(OBJDIR)/pk/libpk.a
@@ -238,10 +235,9 @@ $(OBJDIR):
mkdir -p $(OBJDIR)
mkdir -p $(IMG_DIR)
mkdir -p $(OBJDIR)/genfiles
- $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
- $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
- $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(TOOLS_ATTR_DIR)/src --inc $(PLAT_FAPI2_DIR)/include --src $(PLAT_FAPI2_DIR)/src
- $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl $(GENFILES_DIR) $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(GENFILES_DIR) $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(TOOLS_ATTR_DIR)/src --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
topfixedheaders:
$(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
@@ -250,12 +246,7 @@ attrids:
$(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
platattr:
- $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(TOOLS_ATTR_DIR)/src --inc $(PLAT_FAPI2_DIR)/include --src $(PLAT_FAPI2_DIR)/src
-
-attrserv:
- $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
-
-
+ $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(TOOLS_ATTR_DIR)/src --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
# Build the subdirectories
$(SUBDIRS):
@@ -290,7 +281,7 @@ ppe_trace_bin:
xml: $(FAPI_RC)
$(FAPI_RC): $(TOOLS_ATTR_DIR)/parseErrorInfo.pl $(ERROR_XML_FILES)
- $(TOOLS_ATTR_DIR)/parseErrorInfo.pl --local-ffdc --output-dir=. $(ERROR_XML_FILES)
+ $(TOOLS_ATTR_DIR)/parseErrorInfo.pl --local-ffdc --output-dir=$(GENFILES_DIR) $(ERROR_XML_FILES)
$(IMG_DIR)/fixed.bin: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin
$(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin extract .fixed $(IMG_DIR)/fixed.bin
@@ -308,11 +299,6 @@ tracehash:
clean:
rm -fr $(OBJDIR)
rm -fr $(IMG_DIR)
- rm -f $(TOP-FIXED-HEADERS)
- rm -f collect_reg_ffdc.H hwp_return_codes.H hwp_error_info.H hwp_ffdc_classes.H collect_reg_ffdc.C set_sbe_error.H sbe_build_info.H
- rm -f $(GEN-CREATEATTRGETSETMACROS)
- rm -f $(GEN-PARSEATTRIBUTEINFO)
- rm -f $(GEN-CREATEIFATTRSERVICE)
#Add dependencies to header files
ifneq ($(MAKECMDGOALS),clean)
diff --git a/src/build/topfiles.mk b/src/build/topfiles.mk
deleted file mode 100644
index 71732138..00000000
--- a/src/build/topfiles.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/build/topfiles.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
-TOP-C-SOURCES =
-TOP-CPP-SOURCES =
-TOP-S-SOURCES =
-
-# generated by ppeParseProcSbeFixed.pl
-TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_system.H
-TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_perv.H
-TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_proc_chip.H
-TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_core.H
-TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_ex.H
-TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_eq.H
-
-TOP_OBJECTS = $(TOP-C-SOURCES:.c=.o) $(TOP-CPP-SOURCES:.C=.o) $(TOP-S-SOURCES:.S=.o)
-PLAT_FAPI2_DIR_INCL = $(PLAT_FAPI2_DIR)/include
-# generated by ppeParseAttributeInfo.pl
-GEN-PARSEATTRIBUTEINFO += $(PLAT_FAPI2_DIR_INCL)/fapi2AttributeIds.H
-GEN-PARSEATTRIBUTEINFO += $(PLAT_FAPI2_DIR_INCL)/fapi2ChipEcFeature.C
-GEN-PARSEATTRIBUTEINFO += $(PLAT_FAPI2_DIR_INCL)/fapi2AttributePlatCheck.H
-GEN-PARSEATTRIBUTEINFO += $(PLAT_FAPI2_DIR_INCL)/fapi2AttributesSupported.html
-GEN-PARSEATTRIBUTEINFO += $(PLAT_FAPI2_DIR_INCL)/fapi2AttrInfo.csv
-GEN-PARSEATTRIBUTEINFO += $(PLAT_FAPI2_DIR_INCL)/fapi2AttrEnumInfo.csv
-
-PPE_FAPI2_DIR_SRC = $(PLAT_FAPI2_DIR)/src
-# generated by ppeCreateAttrGetSetMacros.pl
-GEN-CREATEATTRGETSETMACROS += fapi2PlatAttributeService.H.temp
-GEN-CREATEATTRGETSETMACROS += $(PPE_FAPI2_DIR_SRC)/fapi2PlatAttributeService.C
-GEN-CREATEATTRGETSETMACROS += $(PLAT_FAPI2_DIR_INCL)/fapi2PlatAttributeService.H
-
-# generated by ppeCreateIfAttrService.pl
-GEN-CREATEIFATTRSERVICE += $(PLAT_FAPI2_DIR_INCL)/fapi2AttributeService.C
diff --git a/src/hwpf/include/hwp_ffdc_classes.H b/src/hwpf/include/hwp_ffdc_classes.H
deleted file mode 100644
index 6ab79a41..00000000
--- a/src/hwpf/include/hwp_ffdc_classes.H
+++ /dev/null
@@ -1,24 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/hwp_ffdc_classes.H $ */
-/* */
-/* 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 */
OpenPOWER on IntegriCloud