summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorspashabk-in <shakeebbk@in.ibm.com>2018-02-02 00:42:18 -0600
committerSachin Gupta <sgupta2m@in.ibm.com>2018-02-14 07:44:47 -0500
commitdadcf14ae978dae7e74838337c6eec2f13240dad (patch)
tree8561bcda794637df936fb07e5d55477411c4ab58 /src/build
parentfb9f9e8bc9402a3e03e6731dd824d3887d196ebd (diff)
downloadtalos-sbe-dadcf14ae978dae7e74838337c6eec2f13240dad.tar.gz
talos-sbe-dadcf14ae978dae7e74838337c6eec2f13240dad.zip
Project specific makefile changes
remove project dependencies from Makefile Change-Id: I0800dc7ba691234a8063d714884a5cf6c80bf8f7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53250 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r--src/build/Makefile53
-rw-r--r--src/build/img_defs.mk67
-rw-r--r--src/build/power_defs.mk51
3 files changed, 68 insertions, 103 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index c6b1cc40..c2c8c0a8 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -60,14 +60,14 @@ LIB_DIRS += -L$(OBJDIR)/sbefw/core_seeprom
SBECORESEEPROMLIB := $(OBJDIR)/sbefw/core_seeprom/libsbecoreseeprom.a
LLIBS += -lsbecoreseeprom
-SUBDIRS += ../sbefw/app/power
-LIB_DIRS += -L$(OBJDIR)/sbefw/app/power_pibmem
-SBEAPPLIB := $(OBJDIR)/sbefw/app/power_pibmem/libsbeapppowerpibmem.a
-LLIBS += -lsbeapppowerpibmem
+SUBDIRS += ../sbefw/app/$(PROJECT_APP_DIR)
+LIB_DIRS += -L$(OBJDIR)/sbefw/app/$(PROJECT_APP_DIR)_pibmem
+SBEAPPLIB := $(OBJDIR)/sbefw/app/$(PROJECT_APP_DIR)_pibmem/lib$(PROJECT_APP_PIBMEM_LIB).a
+LLIBS += -l$(PROJECT_APP_PIBMEM_LIB)
-LIB_DIRS += -L$(OBJDIR)/sbefw/app/power_seeprom
-SBECORESEEPROMLIB := $(OBJDIR)/sbefw/app/power_seeprom/libsbeapppowerseeprom.a
-LLIBS += -lsbeapppowerseeprom
+LIB_DIRS += -L$(OBJDIR)/sbefw/app/$(PROJECT_APP_DIR)_seeprom
+SBECORESEEPROMLIB := $(OBJDIR)/sbefw/app/$(PROJECT_APP_DIR)_seeprom/lib$(PROJECT_APP_SEEPROM_LIB).a
+LLIBS += -l$(PROJECT_APP_SEEPROM_LIB)
SUBDIRS += ../sbefw/app/common
LIB_DIRS += -L$(OBJDIR)/sbefw/app/common_pibmem
@@ -92,40 +92,9 @@ LIB_DIRS += -L$(OBJDIR)/utils
UTILSLIB := $(OBJDIR)/utils/libutils.a
LLIBS += -lutils
-SUBDIRS += $(ISTEP2_INFRA_DIR)
-LIB_DIRS += -L$(OBJDIR-ISTEP2)
-ISTEP2LIB := $(OBJDIR-ISTEP2)/libistep2.a
-LLIBS += -listep2
-
-SUBDIRS += $(ISTEP3_INFRA_DIR)
-LIB_DIRS += -L$(OBJDIR-ISTEP3)
-ISTEP3LIB := $(OBJDIR-ISTEP3)/libistep3.a
-LLIBS += -listep3
-
-SUBDIRS += $(ISTEP4_INFRA_DIR)
-LIB_DIRS += -L$(OBJDIR-ISTEP4)
-ISTEP4LIB := $(OBJDIR-ISTEP4)/libistep4.a
-LLIBS += -listep4
-
-SUBDIRS += $(ISTEP5_INFRA_DIR)
-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
-LLIBS += -listepcommon
-
-SUBDIRS += $(ARRAYACCESS_INFRA_DIR)
-LIB_DIRS += -L$(OBJDIR-ARRAYACCESS)
-ARRAYACCESS := $(OBJDIR-ARRAYACCESS)/larrayaccess.a
-LLIBS += -larrayaccess
+SUBDIRS += $(PROJ_SUBDIRS)
+LIB_DIRS += $(PROJ_LIB_DIRS)
+LLIBS += $(PROJ_LLIBS)
SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_LOADER_NAME).dis
ifeq ($(img), seeprom)
@@ -296,7 +265,7 @@ _sbecore_seeprom:
$(MAKE) -I $(INCLUDES) -C ../sbefw/core -f Makefile img_mem=seeprom
_sbeapp_seeprom:
$(MAKE) -I $(INCLUDES) -C ../sbefw/app/common -f Makefile img_mem=seeprom
- $(MAKE) -I $(INCLUDES) -C ../sbefw/app/power -f Makefile img_mem=seeprom
+ $(MAKE) -I $(INCLUDES) -C ../sbefw/app/$(PROJECT_APP_DIR) -f Makefile img_mem=seeprom
#Build the SBE XIP Tools
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index f49ece4b..aefe69ff 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -51,10 +51,6 @@
# Defaults to IBM CTE tools path.
#
# OBJDIR : target directory for all generated files
-ifeq ($(project),power)
-include power_defs.mk
-endif
-
ifndef PPE_TYPE
PPE_TYPE := std
endif
@@ -91,35 +87,6 @@ endif
ifndef IMPORT_HWP_MK_DIR
export IMPORT_HWP_MK_DIR = $(BUILD_DIR)/import_hwp_mk/$(project)
endif
-
-ifndef ISTEP2_INFRA_DIR
-export ISTEP2_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep2
-endif
-
-ifndef ISTEP3_INFRA_DIR
-export ISTEP3_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep3
-endif
-
-ifndef ISTEP4_INFRA_DIR
-export ISTEP4_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep4
-endif
-
-ifndef ISTEP5_INFRA_DIR
-export ISTEP5_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep5
-endif
-
-ifndef ISTEPMPIPL_INFRA_DIR
-export ISTEPMPIPL_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istepmpipl
-endif
-
-ifndef ISTEPCOMMON_INFRA_DIR
-export ISTEPCOMMON_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istepcommon
-endif
-
-ifndef ARRAYACCESS_INFRA_DIR
-export ARRAYACCESS_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/arrayaccess
-endif
-
ifndef BOOT_SRCDIR
export BOOT_SRCDIR = $(SBE_SRC_DIR)/boot
endif
@@ -297,34 +264,6 @@ ifndef IMPORT_OBJDIR
export IMPORT_OBJDIR= import_hwp_mk
endif
-ifndef OBJDIR-ISTEP2
-export OBJDIR-ISTEP2 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep2
-endif
-
-ifndef OBJDIR-ISTEP3
-export OBJDIR-ISTEP3 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep3
-endif
-
-ifndef OBJDIR-ISTEP4
-export OBJDIR-ISTEP4 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep4
-endif
-
-ifndef OBJDIR-ISTEP5
-export OBJDIR-ISTEP5 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep5
-endif
-
-ifndef OBJDIR-ISTEPMPIPL
-export OBJDIR-ISTEPMPIPL = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istepmpipl
-endif
-
-ifndef OBJDIR-ISTEPCOMMON
-export OBJDIR-ISTEPCOMMON = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istepcommon
-endif
-
-ifndef OBJDIR-ARRAYACCESS
-export OBJDIR-ARRAYACCESS = $(BASE_OBJDIR)/arrayaccess
-endif
-
ifndef SECURITY_SRC_DIR
export SECURITY_SRC_DIR = $(BUILD_DIR)/security
endif
@@ -539,6 +478,12 @@ ifdef P2P_ENABLE
#use this to disable optimizations (fused compare/branch etc.)
PCP-FLAG = -b
endif
+###########################################################################
+# project specific include
+ifeq ($(project),power)
+include power_defs.mk
+endif
+
############################################################################
#override the GNU Make implicit rule for going from a .C to a .o
diff --git a/src/build/power_defs.mk b/src/build/power_defs.mk
index 2ab49cda..f4d4f751 100644
--- a/src/build/power_defs.mk
+++ b/src/build/power_defs.mk
@@ -6,6 +6,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2017,2018
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +32,52 @@ SBE_TRACE_LEVEL_DEF = 2
FAPI_TRACE_LEVEL_DEF = 2
+ISTEP2_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep2
+ISTEP3_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep3
+ISTEP4_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep4
+ISTEP5_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep5
+ISTEPMPIPL_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istepmpipl
+ISTEPCOMMON_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istepcommon
+ARRAYACCESS_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/arrayaccess
+
+OBJDIR-ISTEP2 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep2
+OBJDIR-ISTEP3 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep3
+OBJDIR-ISTEP4 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep4
+OBJDIR-ISTEP5 = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istep5
+OBJDIR-ISTEPMPIPL = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istepmpipl
+OBJDIR-ISTEPCOMMON = $(BASE_OBJDIR)/$(IMPORT_OBJDIR)/istepcommon
+OBJDIR-ARRAYACCESS = $(BASE_OBJDIR)/arrayaccess
+
+PROJ_SUBDIRS += $(ISTEP2_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ISTEP2)
+PROJ_LLIBS += -listep2
+
+PROJ_SUBDIRS += $(ISTEP3_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ISTEP3)
+PROJ_LLIBS += -listep3
+
+PROJ_SUBDIRS += $(ISTEP4_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ISTEP4)
+PROJ_LLIBS += -listep4
+
+PROJ_SUBDIRS += $(ISTEP5_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ISTEP5)
+PROJ_LLIBS += -listep5
+
+PROJ_SUBDIRS += $(ISTEPMPIPL_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ISTEPMPIPL)
+PROJ_LLIBS += -listepmpipl
+
+PROJ_SUBDIRS += $(ISTEPCOMMON_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ISTEPCOMMON)
+PROJ_LLIBS += -listepcommon
+
+PROJ_SUBDIRS += $(ARRAYACCESS_INFRA_DIR)
+PROJ_LIB_DIRS += -L$(OBJDIR-ARRAYACCESS)
+PROJ_LLIBS += -larrayaccess
+#########################################################
+# mandatory defines #
+#########################################################
IMAGE_SUFFIX := DD2
GCC-DEFS += -DDD2
IMAGE_SEEPROM_NAME := sbe_seeprom_$(IMAGE_SUFFIX)
@@ -42,3 +89,7 @@ IMAGE_BASE_PPE_HEADER := base_ppe_header
SBE_SYMBOLS_NAME := sbe_$(IMAGE_SUFFIX).syms
SBE_STRINGFILE_NAME := sbeStringFile_$(IMAGE_SUFFIX)
+
+PROJECT_APP_DIR := power
+PROJECT_APP_PIBMEM_LIB := sbeapppowerpibmem
+PROJECT_APP_SEEPROM_LIB := sbeapppowerseeprom
OpenPOWER on IntegriCloud