diff options
author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2017-08-21 09:42:11 -0500 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-08-22 09:20:41 -0400 |
commit | 8344a11d2ff2a23a83f2e78d139f5067544850d5 (patch) | |
tree | 7d4cedb9ebbe5776ab78f5a190c910122cb78279 /src/build/citest | |
parent | 87ffda53f58ef4662881bcac6cdcd534115044d4 (diff) | |
download | blackbird-hostboot-8344a11d2ff2a23a83f2e78d139f5067544850d5.tar.gz blackbird-hostboot-8344a11d2ff2a23a83f2e78d139f5067544850d5.zip |
Update bbuild to b0817c_1734.910
Along with updating the bbuild, this commit removes pre- and post-
simics workarounds that are no longer needed.
Change-Id: I1ff4bd0092c8b5dcbfc683327f0dc0b2b4b82793
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44913
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@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 | 8 | ||||
-rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 7 |
3 files changed, 1 insertions, 16 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 14cf5143f..fee10c166 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips910/Builds/b0720b_1730.910 +/esw/fips910/Builds/b0817c_1734.910 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index cee847cd6..6095b331a 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -34,11 +34,3 @@ #patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File #pull in new actions in p9_memory.act RTC 171066 -#wof data image -echo "Applying SIMICS workaround to support WOF data generation" -sbex -t 1025390 -mkdir -p $sb/engd/wofdata/ -cd $sb/engd/wofdata -mk -a -k -echo "Applying SIMICS workaround to support obus image build" -sbex -t 1030705 diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index 21e23e5b7..9e47863ae 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -35,10 +35,3 @@ #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 -# Pull in SBE Support of Unsecure Memory Regions and Cumulus SBE Files -echo "Pull in SBE Support of Unsecure Memory Regions and Cumulus SBE Files" -sbex -t 1030098 1029840 -mkdir -p $sb/sbei/sbfw/ -cd $sb/sbei/sbfw -chmod 777 -R . -mk -a -k |