diff options
Diffstat (limited to 'src/build')
| -rw-r--r-- | src/build/Makefile | 14 | ||||
| -rw-r--r-- | src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk | 1 | ||||
| -rw-r--r-- | src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk | 1 | ||||
| -rw-r--r-- | src/build/linkerscripts/power/linkseeprom.cmd | 3 |
4 files changed, 12 insertions, 7 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 diff --git a/src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk index becdb2b7..1808444b 100644 --- a/src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk +++ b/src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk @@ -42,6 +42,7 @@ ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_init.C ISTEPCOMMON-CPP-SOURCES +=p9_adu_setup.C ISTEPCOMMON-CPP-SOURCES +=p9_adu_coherent_utils.C ISTEPCOMMON-CPP-SOURCES +=p9_adu_access.C +ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C #Istep2 Procedure but this is required to run from PIBMEM ISTEPCOMMON-CPP-SOURCES +=p9_sbe_tp_switch_gears.C ISTEPCOMMON-CPP-SOURCES +=p9_sbe_npll_setup.C diff --git a/src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk b/src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk index b0c7d86e..e353031f 100644 --- a/src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk +++ b/src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk @@ -53,7 +53,6 @@ ISTEPMPIPL-CPP-SOURCES +=p9_perv_sbe_cmn.C ISTEPMPIPL-CPP-SOURCES +=p9_suspend_powman.C ISTEPMPIPL-CPP-SOURCES +=p9_collect_suspend_ffdc.C ISTEPMPIPL-CPP-SOURCES +=p9_eq_clear_atomic_lock.C -ISTEPMPIPL-CPP-SOURCES +=p9_ram_core.C ISTEPMPIPL-CPP-SOURCES +=p9_query_cache_access_state.C # Fast array procedures are moved here to locate it on seeprom ISTEPMPIPL-CPP-SOURCES += p9_sbe_fastarray_abist_catchup.C diff --git a/src/build/linkerscripts/power/linkseeprom.cmd b/src/build/linkerscripts/power/linkseeprom.cmd index 77224a69..4742f608 100644 --- a/src/build/linkerscripts/power/linkseeprom.cmd +++ b/src/build/linkerscripts/power/linkseeprom.cmd @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -97,7 +98,7 @@ SECTIONS //////////////////////////////// .text ALIGN(8): { _text_origin = .; _text_offset = . - _seeprom_origin; - *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) *\libsbecoreseeprom.a:(.text* ) *\libsbeapppowerseeprom.a:(.text* ) *\libsbeappcommonseeprom.a:(.text* ) } > seeprom + *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) *\libsbecoreseeprom.a:(.text* ) *\libsbeapppowerseeprom.a:(.text* ) *\libsbeappcommonseeprom.a:(.text* ) *\libfapi2seeprom.a:(.text* ) } > seeprom _text_size = . - _text_origin; //////////////////////////////// |
