diff options
| author | Bill Hoffa <wghoffa@us.ibm.com> | 2018-03-20 11:33:42 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-03-22 12:13:59 -0400 |
| commit | 9de67e525158bdaed7872fe8eb4e9779a18d0f46 (patch) | |
| tree | ac6a94942098053cb683d35a503292010c1775e5 /src/build/citest | |
| parent | 3d7aee811e82959c8f250ce8190ffb739280f6ee (diff) | |
| download | talos-hostboot-9de67e525158bdaed7872fe8eb4e9779a18d0f46.tar.gz talos-hostboot-9de67e525158bdaed7872fe8eb4e9779a18d0f46.zip | |
Update Bbuild to b0316a_1813.920
- 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>
Diffstat (limited to 'src/build/citest')
| -rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 5 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index cd75bd04b..5f04bb8c9 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1,2 +1,2 @@ -/esw/fips911/Builds/b0222a_1810.911 +/esw/fips920/Builds/b0316a_1813.920 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index dda3cbfac..eb53ae00f 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -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 diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index 03e950681..3ae09f9a3 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -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 @@ -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 |
