summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorSantosh Puranik <santosh.puranik@in.ibm.com>2017-05-29 06:15:17 -0500
committerSantosh S. Puranik <santosh.puranik@in.ibm.com>2017-05-31 23:59:53 -0400
commite97705e412957844cc516486a6686de1a8d69ecb (patch)
tree366cabe4a468c5f85917c48ad4423c8d2ed61711 /src/build
parent5110484932840cd55a361b6bbe8bef5aa24b27e3 (diff)
downloadtalos-sbe-e97705e412957844cc516486a6686de1a8d69ecb.tar.gz
talos-sbe-e97705e412957844cc516486a6686de1a8d69ecb.zip
FAPI Plat Cleanup
-- Remove src and include subdirs Change-Id: I47d2b7d0b3667e7765692fb014932ae23a6325f7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41085 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.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/build')
-rw-r--r--src/build/Makefile8
-rw-r--r--src/build/img_defs.mk5
2 files changed, 6 insertions, 7 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index 1c974f6f..ee8a3389 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -44,7 +44,7 @@ SBEFWLIB := $(OBJDIR)/sbefw/libsbefw.a
LLIBS += -lsbefw
# FAPI2 library
-SUBDIRS += $(PLAT_FAPI2_DIR)/src
+SUBDIRS += $(PLAT_FAPI2_DIR)
LIB_DIRS += -L$(OBJDIR)/fapi2
FAPI2LIB := $(OBJDIR)/fapi2/libfapi2.a
LLIBS += -lfapi2
@@ -247,16 +247,16 @@ $(OBJDIR):
mkdir -p $(IMPORT_OBJDIR)
$(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 $(PLAT_FAPI2_DIR)/src/plat --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
+ $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR) --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
topfixedheaders:
$(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
attrids:
- $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR) $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
platattr:
- $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR)/src/plat --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
+ $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR) --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
# Build the subdirectories
$(SUBDIRS):
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index dda6bd36..2b0e6998 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -431,8 +431,8 @@ export LD_LIBRARY_PATH+=:$(CROSS_COMPILER_PATH)/lib
INCLUDES += $(IMG_INCLUDES)
INCLUDES += -I$(BUILD_DIR)/../../include
INCLUDES += -I$(HWPLIB_SRCDIR)
-INCLUDES += -I$(PLAT_FAPI2_DIR)/include/plat
-INCLUDES += -I$(PLAT_FAPI2_DIR)/include
+INCLUDES += -I$(GENFILES_DIR)
+INCLUDES += -I$(PLAT_FAPI2_DIR)
INCLUDES += -I$(BASE_FAPI2_DIR)/include
INCLUDES += -I$(PK_SRCDIR)/../include
INCLUDES += -I$(PK_SRCDIR)/$(PPE_TYPE)
@@ -443,7 +443,6 @@ INCLUDES += -I$(PK_SRCDIR)/ppe
INCLUDES += -I$(PK_SRCDIR)/ppe42
INCLUDES += -I$(SBE_FW_DIR)
INCLUDES += -I$(BOOT_SRCDIR)
-INCLUDES += -I$(GENFILES_DIR)
INCLUDES += -I$(BUILDDATA_SRCDIR)
INCLUDES += -I$(PK_SRCDIR)/trace
INCLUDES += -I$(PPETRACEPP_DIR)
OpenPOWER on IntegriCloud