Skip to content

Commit

Permalink
Update Bbuild to b0316a_1813.920
Browse files Browse the repository at this point in the history
  - Pull in track 1049203 to update to fi180319a900.50 sim model level

Change-Id: I9aa9dff6b8661d9e136afc67339bb882272d5c7f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56083
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
wghoffa authored and dcrowell77 committed Mar 22, 2018
1 parent 3d7aee8 commit 9de67e5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/build/citest/etc/bbuild
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/esw/fips911/Builds/b0222a_1810.911
/esw/fips920/Builds/b0316a_1813.920

5 changes: 0 additions & 5 deletions src/build/citest/etc/workarounds.postsimsetup
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,3 @@
#mkdir -p $sb/simu/data/cec-chip/
#cp $BACKING_BUILD/src/simu/data/cec-chip/base_cec_chip_file $sb/simu/data/cec-chip
#patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File

echo sbex track 1046040 for p9c dd1.1 sbe image
sbex -t 1046040
cd $sb/sbei/sbfw/img/
mk -a
4 changes: 2 additions & 2 deletions src/build/citest/etc/workarounds.presimsetup
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@

echo "+++ Need to alter where we look for pnor images so they will be picked up properly"
mkdir -p $sb/simu/data

echo "+++ Get some simics info changes"
sbex -t 1045730
sbex -t 1049203

###############################################################################
### NOTE - if you need to sbex a simicsInfo track it needs to be done BEFORE
Expand All @@ -50,5 +51,4 @@ mv $sb/simu/data/simicsInfo.new $sb/simu/data/simicsInfo
echo "IMGS:NIMBUS_PNOR_IMG | FLASH:nimbus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
echo "IMGS:BOSTON_PNOR_IMG | FLASH:nimbus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
echo "IMGS:CUMULUS_PNOR_IMG | FLASH:cumulus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
echo "MACHINE:CUMULUS_CDIMM| CODENAME:"Cumulus" | DESC:"P9 Cumulus standalone config" | CONF_FILE:P9_CUMULUS.config | TGT:targets/p9_cumulus/p9_cumulus_1.simics | REL_EXLD:fips730,fips731 | CONTEXT:ppc | SIMENV:DEFAULT | PROC:P9 | IMGS:CUMULUS_CDIMM_PNOR_IMG | IMGS:OTPROM_SBE_IMG_DD1_BIN | IMGS:SEEPROM_SBE_IMG_DD1_BIN | IMGS:PIBMEM_SBE_IMG_DD1_BIN | IMGS:OTPROM_SBE_IMG_DD2_BIN | IMGS:SEEPROM_SBE_IMG_P9C_BIN | IMGS:PIBMEM_SBE_IMG_DD2_BIN | IMGS:HOSTBOOT_IMG" >> $sb/simu/data/simicsInfo
echo "IMGS:CUMULUS_CDIMM_PNOR_IMG | FLASH:cumulus_cdimm.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo

0 comments on commit 9de67e5

Please sign in to comment.