From c8588dc80381558a0a8d630501f79572890cd40c Mon Sep 17 00:00:00 2001 From: Martin Peschke Date: Thu, 7 Jul 2016 15:17:05 +0200 Subject: SBE Image Build Flow: no 2kB .overrides placeholder anylonger We used to reserve 2kB inside the SBE Image for .overrides, which was assumed to be replaced or overwritten with real override rings. The requirements have been relaxed, the placeholder is being removed. This will simplify the placement of .override content from a tools perspective, making the placement similar to what we will do as to .hbbl: we simply call p9_xip_append(). Change-Id: I9b8268cc63d568baf81f889c97aa95c2afdbcdc1 RTC: 157404 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26702 Tested-by: Jenkins Server Reviewed-by: Prachi Gupta Reviewed-by: Sachin Gupta Reviewed-by: Claus M. Olsen Reviewed-by: Martin Peschke --- sbe/image/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sbe') diff --git a/sbe/image/Makefile b/sbe/image/Makefile index bf1ba77e..f03bc65c 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -260,9 +260,9 @@ all: @echo "Makefile option error: ALL is not compatible with FAPI2_test" endif -.PHONY: all normalize defaultset appendloader add_L1_LoaderAddr add_L2_LoaderAddr add_kernelAddr symbols appendoverrides report +.PHONY: all normalize defaultset appendloader add_L1_LoaderAddr add_L2_LoaderAddr add_kernelAddr symbols report -all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_LOADER_NAME).bin $(OBJDIR)/$(IMAGE_OTPROM_NAME).bin $(SBE_TOOLS) normalize defaultset $(OBJDIR)/fixed.bin appendloader appendoverrides add_L1_LoaderAddr add_L2_LoaderAddr add_kernelAddr symbols tracehash buildinfo report +all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_LOADER_NAME).bin $(OBJDIR)/$(IMAGE_OTPROM_NAME).bin $(SBE_TOOLS) normalize defaultset $(OBJDIR)/fixed.bin appendloader add_L1_LoaderAddr add_L2_LoaderAddr add_kernelAddr symbols tracehash buildinfo report buildinfo: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin @@ -443,10 +443,6 @@ $(OBJDIR)/fixed.bin: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin appendloader: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_LOADER_NAME).bin $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin append .baseloader $(OBJDIR)/$(IMAGE_LOADER_NAME).bin -appendoverrides: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin - dd if=/dev/zero of=$(OBJDIR)/overrides.bin count=1 bs=2048 - $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin append .overrides $(OBJDIR)/overrides.bin - #/afs/bb/proj/cte/tools/ppetools/prod/powerpc-eabi/bin/objcopy -O binary --only-section=.fixed $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJDIR)/fixed.bin # collect all of the trace hash files for this image into a single trexStringFile -- cgit v1.2.1