diff options
| author | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-02-02 04:46:08 -0600 |
|---|---|---|
| committer | Amit J. Tendolkar <amit.tendolkar@in.ibm.com> | 2016-02-03 10:59:13 -0600 |
| commit | 2890c348e4348ee59dd3a929b5614c54b02e276e (patch) | |
| tree | 0e9d67df10a0e171c610f2c747c6ff6a2a17ba64 /sbe | |
| parent | e1fcebc82cd7c29d1e90fd64dd6588a042e6d970 (diff) | |
| download | talos-sbe-2890c348e4348ee59dd3a929b5614c54b02e276e.tar.gz talos-sbe-2890c348e4348ee59dd3a929b5614c54b02e276e.zip | |
Change image names
Change-Id: I537ed54a8e1558ac6af195f82e473fb9de733f67
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23885
Tested-by: Jenkins Server
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Amit J. Tendolkar <amit.tendolkar@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/img_defs.mk | 6 |
4 files changed, 16 insertions, 3 deletions
diff --git a/sbe/build/citest/etc/patches/patchlist.txt b/sbe/build/citest/etc/patches/patchlist.txt index 6e932f48..dc455e92 100644 --- a/sbe/build/citest/etc/patches/patchlist.txt +++ b/sbe/build/citest/etc/patches/patchlist.txt @@ -8,3 +8,6 @@ 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 new file mode 100644 index 00000000..86dc3278 --- /dev/null +++ b/sbe/build/citest/etc/patches/simicsInfo.patch @@ -0,0 +1,6 @@ +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 df18fda1..4b8b9bd4 100755 --- a/sbe/build/citest/etc/workarounds.presimsetup +++ b/sbe/build/citest/etc/workarounds.presimsetup @@ -6,3 +6,7 @@ #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/img_defs.mk b/sbe/image/img_defs.mk index 84025fcc..c4632ec2 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -32,9 +32,9 @@ # # OBJDIR : target directory for all generated files -IMAGE_SEEPROM_NAME := seeprom_main -IMAGE_SBE_NAME := sbe_main -IMAGE_LOADER_NAME := loader_main +IMAGE_SEEPROM_NAME := sbe_seeprom +IMAGE_SBE_NAME := sbe_pibmem +IMAGE_LOADER_NAME := sbe_loader SBE_SYMBOLS_NAME := sbe.syms |
