diff options
| author | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-02-12 05:06:52 -0600 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-02-14 22:37:27 -0600 |
| commit | 34c9bd72afe03e36b04a2d965cfeff4cb34066f7 (patch) | |
| tree | 357ba86f1abda578d0bac660e378338551a473d1 /sbe | |
| parent | c43b86bd51f6f2fc090401b38baf16c0828ec627 (diff) | |
| download | talos-sbe-34c9bd72afe03e36b04a2d965cfeff4cb34066f7.tar.gz talos-sbe-34c9bd72afe03e36b04a2d965cfeff4cb34066f7.zip | |
Added sbe_main.bin support back
Simics does not pick the new filenames even if we change simicsInfo
file. Till the time simics chnages are not in driver, we have to
use old names for our testing
Change-Id: I41a83850d636164172a005fb0b746953030442eb
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24252
Tested-by: Jenkins Server
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'sbe')
| -rw-r--r-- | sbe/build/citest/etc/patches/patchlist.txt | 3 | ||||
| -rw-r--r-- | sbe/build/citest/etc/patches/simicsInfo.patch | 6 | ||||
| -rwxr-xr-x | sbe/build/citest/etc/workarounds.presimsetup | 4 | ||||
| -rw-r--r-- | sbe/image/Makefile | 6 |
4 files changed, 6 insertions, 13 deletions
diff --git a/sbe/build/citest/etc/patches/patchlist.txt b/sbe/build/citest/etc/patches/patchlist.txt index dc455e92..6e932f48 100644 --- a/sbe/build/citest/etc/patches/patchlist.txt +++ b/sbe/build/citest/etc/patches/patchlist.txt @@ -8,6 +8,3 @@ RTC: 144728 Files : pervasive.act.patch. Currently SUET does not support FSIMBOX KW. Once support is in, remove this patch. - -CQ: SW333946 -Files: simicsInfo.patch. This patch is used to change sbe image name is simics. diff --git a/sbe/build/citest/etc/patches/simicsInfo.patch b/sbe/build/citest/etc/patches/simicsInfo.patch deleted file mode 100644 index 86dc3278..00000000 --- a/sbe/build/citest/etc/patches/simicsInfo.patch +++ /dev/null @@ -1,6 +0,0 @@ -35,36c35,36 -< IMGS:SBE_IMG_OUT | FLASH:sbe_main.out | LOC:ENVVAR_SIMICS_GSA_CELL/projects/s/simics_hb_images/nimbus -< IMGS:SBE_IMG_BIN | FLASH:sbe_main.bin | LOC:SB_CHAIN/images/ppc/lab/flash ---- -> IMGS:SBE_IMG_OUT | FLASH:sbe_pibmem.out | LOC:ENVVAR_SIMICS_GSA_CELL/projects/s/simics_hb_images/nimbus -> IMGS:SBE_IMG_BIN | FLASH:sbe_pibmem.bin | LOC:SB_CHAIN/images/ppc/lab/flash diff --git a/sbe/build/citest/etc/workarounds.presimsetup b/sbe/build/citest/etc/workarounds.presimsetup index 4b8b9bd4..df18fda1 100755 --- a/sbe/build/citest/etc/workarounds.presimsetup +++ b/sbe/build/citest/etc/workarounds.presimsetup @@ -6,7 +6,3 @@ #egrep -v "WSALIAS DEFAULT FIPSLEVEL|WSALIAS DEFAULT SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo -echo "+++ Updating simicsInfo file" -mkdir -p $sb/simu/data -cp $BACKING_BUILD/src/simu/data/simicsInfo $sb/simu/data -patch -p0 $sb/simu/data/simicsInfo $SBEROOT/sbe/build/citest/etc/patches/simicsInfo.patch diff --git a/sbe/image/Makefile b/sbe/image/Makefile index 900246aa..248af833 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -146,10 +146,16 @@ $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).dis: $(OBJDIR)/$(IMA $(OBJCOPY) -O binary $< $(OBJDIR)/$(IMAGE_SBE_NAME).bin --pad-to 0x`/usr/bin/nm $(OBJDIR)/$(IMAGE_SBE_NAME).out | grep "A _sbe_end" | cut -d " " -f 1` $(OBJDUMP) -S $< > $(OBJDIR)/$(IMAGE_SBE_NAME).dis $(NM) $< > $(OBJDIR)/$(IMAGE_SBE_NAME).syms + # TODO via SW333946 + # Remove this once we have simics support for new file names. + cp $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/sbe_main.bin # create a linked ELF executable $(OBJDIR)/$(IMAGE_SBE_NAME).out: pibMemAttrSet buildInfo $(OBJDIR)/base_sbe_fixed.o $(LINK_OBJS) $(LINK_SCRIPT_SBE) $(LD) -e __system_reset -T$(LINK_SCRIPT_SBE) -Map $(OBJDIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(OBJDIR)/base_sbe_fixed.o --start-group $(LLIBS) --end-group + # TODO via SW333946 + # Remove this once we have simics support for new file names. + cp $(OBJDIR)/$(IMAGE_SBE_NAME).out $(OBJDIR)/sbe_main.out # pass the link command file through the C preprocessor to evaluate macros and remove comments $(LINK_SCRIPT_SBE): linksbe.cmd |
