Update bbuild to b0129a and remove patches

Change-Id: Ia67c9211c7605466ce66bb97f27467ef40501a75
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35828
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

6 files changed, 1 insertions, 68 deletions

diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 427b6f6bf..a0b3df81f 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips910/Builds/b0103a_1702.910
+/esw/fips910/Builds/b0129a_1706.910
diff --git a/src/build/citest/etc/patches/p9_system.act_pcie_patch b/src/build/citest/etc/patches/p9_system.act_pcie_patch
deleted file mode 100644
index 5e5c7bbbf..000000000
--- a/src/build/citest/etc/patches/p9_system.act_pcie_patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- p9_system.act	2017-01-13 17:11:53.384661763 -0600
-+++ p9_system.act_with_pcie	2017-01-13 17:12:59.195354011 -0600
-@@ -416,3 +416,14 @@
-   EFFECT: TARGET=[INDSCOM_800A3820(0x0601143F)] OP=[BIT,ON] BIT=[53] # Rx Dccal Done
- }
- 
-+# ##########################################################################
-+# PCIE scom init - PMA reset action
-+# ##########################################################################
-+CAUSE_EFFECT CHIPLETS pcie {
-+  LABEL=[CHIPLET PMA reset]
-+  WATCH=[REG(MYCHIPLET,0x000029)]
-+  CAUSE: TARGET=[REG(MYCHIPLET, 0x000029)] OP=[BIT,ON] BIT=[29] #start bit
-+  EFFECT: TARGET=[INDSCOM_80000501(MYCHIPLET,0x010C3F)] OP=[BIT,ON] BIT=[58]
-+  EFFECT: TARGET=[INDSCOM_80000541(MYCHIPLET,0x010C3F)] OP=[BIT,ON] BIT=[58]
-+}
-+
diff --git a/src/build/citest/etc/patches/p9n_10.scomdef_with_pcie_patch b/src/build/citest/etc/patches/p9n_10.scomdef_with_pcie_patch
deleted file mode 100644
index a70bb4b94..000000000
--- a/src/build/citest/etc/patches/p9n_10.scomdef_with_pcie_patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- p9n_10.scomdef	2017-01-12 14:13:01.000000000 -0600
-+++ p9n_10.scomdef_with_pcie	2017-01-13 09:13:26.833173794 -0600
-@@ -672388,6 +672388,14 @@
-     Address = {0x09011040, 0x09011041, 0x09011042, 0x09011043, 0x09011044, 0x09011045, 0x09011046, 0x09011047}
- END Scom
- 
-+BEGIN Scom
-+    Address = {0x8000049F0D010C3F, 0x8000049F0E010C3F, 0x8000049F0F010C3F}
-+END Scom
-+
-+BEGIN Scom
-+    Address = {0x800004A00D010C3F, 0x800004A00E010C3F, 0x800004A00F010C3F}
-+END Scom
-+
- * $Id: fig2scom.C,v 1.39 2016/10/10 10:53:46 koesters Exp $
- 
- 
diff --git a/src/build/citest/etc/patches/patchlist.txt b/src/build/citest/etc/patches/patchlist.txt
index a469a1f5e..6f72600b5 100644
--- a/src/build/citest/etc/patches/patchlist.txt
+++ b/src/build/citest/etc/patches/patchlist.txt
@@ -5,9 +5,3 @@ Brief description of the problem or reason for patch
 -Files: list of files
 -Coreq: list of associated changes, e.g. workarounds.presimsetup
 
-Need additional actions for PCIE scom init PMA reset
--RTC: 167283
--CMVC: 1014186
--Files: p9_system.act, p9n_10.scomdef
--Coreq: workarounds.postsimsetup
-
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index b1a827966..af86463f9 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -34,27 +34,3 @@
 #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
 
-### RTC 167283 - Patch begins
-echo "+++ Updating p9n action file for pcie_scom_init"
-echo "+++ SB: " $sb
-echo "+++ BACKING_BUILD: " $BACKING_BUILD
-echo "+++ PROJECT_ROOT: " $PROJECT_ROOT
-
-### Update p9_system.act for pcie_scom_init
-### Use this file in order to be able to checkin immediately, p9n.act is held up by other tracks
-mkdir -p  $sb/simu/data/cec-chip/
-cp $BACKING_BUILD/src/simu/data/cec-chip/p9_system.act $sb/simu/data/cec-chip/
-patch -p0 $sb/simu/data/cec-chip/p9_system.act $PROJECT_ROOT/src/build/citest/etc/patches/p9_system.act_pcie_patch
-
-### Update p9n_10.scomdef for pcie_scom_init
-echo "+++ Adding addresses to p9n_10.scomdef for pcie_scom_init"
-mkdir -p  $sb/engd/scomdef/
-cp $BACKING_BUILD/src/engd/scomdef/p9n_10.scomdef $sb/engd/scomdef/
-patch -p0 $sb/engd/scomdef/p9n_10.scomdef $PROJECT_ROOT/src/build/citest/etc/patches/p9n_10.scomdef_with_pcie_patch
-echo "+++ Building indirect scom action with new p9n_10.scomdef"
-cd $sb/simu/
-mk -a -j32
-#execute_in_sandbox "cd $sb/simu/ && mk -a -j32"
-echo "+++ Done building"
-### RTC 167283 - Patch ends
-
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index bb86ddc18..9e47863ae 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -35,6 +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
 
-echo "Applying SIMICS workaround to support TPM reset"
-sbex -t 1014303 -r fips910
-