summaryrefslogtreecommitdiffstats
path: root/src/build/Makefile
diff options
context:
space:
mode:
authorShakeeb A. Pasha B K <shakeebbk@in.ibm.com>2018-03-26 02:21:04 -0400
committerSachin Gupta <sgupta2m@in.ibm.com>2018-03-29 05:12:03 -0400
commit783b420403b7d649b38ffd4772dc422499914449 (patch)
treefb8305ddb24bccd60dfa74e8bdc35dbdbd3d55c8 /src/build/Makefile
parentb6c3a885a1ff9e1ea22b7c71ee6da7a860908b3d (diff)
downloadtalos-sbe-783b420403b7d649b38ffd4772dc422499914449.tar.gz
talos-sbe-783b420403b7d649b38ffd4772dc422499914449.zip
Revert "SBE Space optimisation" by moving ramming to pibmem
This reverts commit 2dce1d2d7fbbca6e1f917fb9c76632561c5a84b1. And move plat target init and plat attr init to seeprom Perfromace measurements - from sbe_tart to proc_attn_listen: Without this change: 3.433112590s With this change : 3.458556197s Change-Id: If6b5dfcae2e40aa5d0d608e1d01036546c525628 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56239 Reviewed-by: RAJA DAS <rajadas2@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: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/build/Makefile')
-rw-r--r--src/build/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index 928627cc..d144fcc7 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -84,6 +84,10 @@ LIB_DIRS += -L$(OBJDIR)/fapi2
FAPI2LIB := $(OBJDIR)/fapi2/libfapi2.a
LLIBS += -lfapi2
+LIB_DIRS += -L$(OBJDIR)/fapi2_seeprom
+FAPI2LIB := $(OBJDIR)/fapi2/libfapi2seeprom.a
+LLIBS += -lfapi2seeprom
+
include $(HWPERR_SRCDIR)/hwpErrors.mk
# Common Utils library
@@ -138,7 +142,7 @@ $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis: $(IMG
$(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis
#create a linked ELF executable
-$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) _sbecore_seeprom _sbeapp_seeprom $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM)
+$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) _seeprom_libs $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM)
$(LD) -n -T$(LINK_SCRIPT_SEEPROM) -Map $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).map \
-Bstatic -o $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(BOOT_OBJECTS) $(BUILDDATA_OBJDIR)/$(IMAGE_BASE_PPE_HEADER).o $(OBJS) $(LIB_DIRS) \
--start-group $(LLIBS) --end-group
@@ -158,7 +162,7 @@ $(IMG_DIR)/$(IMAGE_SBE_NAME).bin $(IMG_DIR)/$(IMAGE_SBE_NAME).dis: $(IMG_DIR)/$(
$(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SBE_NAME).dis
# create a linked ELF executable
-$(IMG_DIR)/$(IMAGE_SBE_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) _sbecore_seeprom _sbeapp_seeprom $(LINK_OBJS) $(LINK_SCRIPT_SBE)
+$(IMG_DIR)/$(IMAGE_SBE_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) _seeprom_libs $(LINK_OBJS) $(LINK_SCRIPT_SBE)
$(LD) -e __system_reset -T$(LINK_SCRIPT_SBE) -Map $(IMG_DIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(IMG_DIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(BUILDDATA_OBJDIR)/base_sbe_fixed.o --start-group $(LLIBS) --end-group
# pass the link command file through the C preprocessor to evaluate macros and remove comments
@@ -196,7 +200,7 @@ tar:
@echo "Generated simics.tar in Sbe images Directory"
.PHONY: all normalize compress defaultset appendloader add_LoaderAddr symbols report \
- appendoverrides xml security tracehash topfixedheaders $(SUBDIRS) _sbecore_seeprom _sbeapp_seeprom\
+ appendoverrides xml security tracehash topfixedheaders $(SUBDIRS) _seeprom_libs \
tar install
buildinfo: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin
@@ -262,9 +266,9 @@ platattr:
# Build the subdirectories
$(SUBDIRS):
$(MAKE) -I $(INCLUDES) -C $@ -f Makefile
-_sbecore_seeprom:
+_seeprom_libs:
+ $(MAKE) -I $(INCLUDES) -C ../hwpf -f Makefile img_mem=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/$(PROJECT_APP_DIR) -f Makefile img_mem=seeprom
OpenPOWER on IntegriCloud