diff options
| author | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-01-22 07:25:52 -0600 |
|---|---|---|
| committer | Amit J. Tendolkar <amit.tendolkar@in.ibm.com> | 2016-02-03 00:11:34 -0600 |
| commit | 309c9ac32ee2e05ea5975b0973f79cd8b22acda2 (patch) | |
| tree | b880d80e2137fe112bc7f79e5fd7216c79a3d03d /sbe/image | |
| parent | 2e11746c1056200052945409351666166d2250be (diff) | |
| download | talos-sbe-309c9ac32ee2e05ea5975b0973f79cd8b22acda2.tar.gz talos-sbe-309c9ac32ee2e05ea5975b0973f79cd8b22acda2.zip | |
Update header fields for loader
Change-Id: If1cde44f430253909feaf5c817178369a1fb3754
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23526
Tested-by: Jenkins Server
Reviewed-by: Amit J. Tendolkar <amit.tendolkar@in.ibm.com>
Diffstat (limited to 'sbe/image')
| -rw-r--r-- | sbe/image/Makefile | 12 | ||||
| -rw-r--r-- | sbe/image/base_ppe_header.S | 17 |
2 files changed, 16 insertions, 13 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile index f1fec21e..3618cc84 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -173,15 +173,15 @@ all: @echo "Makefile option error: ALL is not compatible with FAPI2_test" endif -.PHONY: all normalize defaultset appendbase appendloader add_entry_offset add_entry_address_sbe symbols +.PHONY: all normalize defaultset appendbase appendloader add_L1_LoaderAddr add_kernelAddr symbols -all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_LOADER_NAME).bin $(SBE_TOOLS) normalize defaultset $(OBJDIR)/fixed.bin appendbase appendloader add_entry_offset add_entry_address_sbe symbols tracehash +all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_LOADER_NAME).bin $(SBE_TOOLS) normalize defaultset $(OBJDIR)/fixed.bin appendbase appendloader add_L1_LoaderAddr add_kernelAddr symbols tracehash -add_entry_offset: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out - $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin set entry_offset 0x`nm $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out | grep sbe_loader | cut -f 1 -d " "` +add_L1_LoaderAddr: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out + $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin set L1_LoaderAddr 0x`nm $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out | grep sbe_loader | cut -f 1 -d " "` -add_entry_address_sbe: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_LOADER_NAME).out - $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin set entry_address_sbe 0x`nm $(OBJDIR)/$(IMAGE_LOADER_NAME).out | grep base_loader | cut -f 1 -d " "` +add_kernelAddr: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_LOADER_NAME).out + $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin set kernelAddr 0x`nm $(OBJDIR)/$(IMAGE_LOADER_NAME).out | grep base_loader | cut -f 1 -d " "` symbols: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJDIR)/$(IMAGE_LOADER_NAME).out $(OBJDIR)/$(IMAGE_SBE_NAME).out $(NM) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out > $(OBJDIR)/$(SBE_SYMBOLS_NAME) diff --git a/sbe/image/base_ppe_header.S b/sbe/image/base_ppe_header.S index 92fb606b..3d3ae607 100644 --- a/sbe/image/base_ppe_header.S +++ b/sbe/image/base_ppe_header.S @@ -89,19 +89,22 @@ __\s\()_section: __magic: .quad (\magic) -__entry_offset: - .quad ((\entry_point) - (\link_address)) +__L1_LoaderAddr: + .quad 0 +__L2_LoaderAddr: + .quad 0 +__kernelAddr: + .quad 0 __link_address: .quada (\link_address) -__entry_address_sbe: - .quad 0 __header_64_reserved: - .quad 0, 0, 0, 0 + .quad 0, 0, 0 .xip_toc magic, P9_XIP_UINT64, __magic - .xip_toc entry_offset, P9_XIP_UINT64, __entry_offset + .xip_toc L1_LoaderAddr, P9_XIP_UINT64, __L1_LoaderAddr + .xip_toc L2_LoaderAddr, P9_XIP_UINT64, __L2_LoaderAddr + .xip_toc kernelAddr, P9_XIP_UINT64, __kernelAddr .xip_toc link_address, P9_XIP_UINT64, __link_address - .xip_toc entry_address_sbe, P9_XIP_UINT64, __entry_address_sbe ////////////////////////////////////////////////////////////////////// // Section Table - 8-byte aligned; 16 entries; Not TOC-Indexed |
