diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-03-17 15:57:02 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-03-20 11:52:17 -0400 |
| commit | b510692e6531f5945e81f0f786b5a0ba61bde650 (patch) | |
| tree | e0eef05d4278195438c1500e88bdf6494d7386ee /src/build/citest/etc/workarounds.postsimsetup | |
| parent | 9ebb5f895658864ecaf3b1d02b64414ebe4f2215 (diff) | |
| download | talos-hostboot-b510692e6531f5945e81f0f786b5a0ba61bde650.tar.gz talos-hostboot-b510692e6531f5945e81f0f786b5a0ba61bde650.zip | |
Fix up some bad merges and remove some bbuild patches
Had another merge hiccup that brought in some workarounds that
we previously removed.
Also removed a workaround we don't need anymore since the last
bbuild update.
Change-Id: Icf15be5811c2d0465e1772f230c46a0de203d2c2
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38120
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/citest/etc/workarounds.postsimsetup')
| -rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 170597184..5e945a745 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -33,21 +33,6 @@ #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 -#Need a newer HW image due to some co-reqs, pull in hw022817a.910 -sbex -t 1018118 -cd $sb/engd/href/ -mk -a -k - -### RTC 170736 - Patch begins -echo "+++ Updating p9n.act file for p9_fab_iovalid_link_validate" -echo "+++ SB: " $sb -echo "+++ BACKING_BUILD: " $BACKING_BUILD -echo "+++ PROJECT_ROOT: " $PROJECT_ROOT - -mkdir -p $sb/simu/data/cec-chip/ -cp $BACKING_BUILD/src/simu/data/cec-chip/p9n.act $sb/simu/data/cec-chip/ -patch -p0 $sb/simu/data/cec-chip/p9n.act $PROJECT_ROOT/src/build/citest/etc/patches/p9n.act_fab_io_patch -### RTC 170736 - Patch ends #pull in new actions in p9_memory.act RTC 171066 echo "+++ Updating p9n_memory.act file for p9_mss_ddr_phy_reset" |
