Update bbuild level to pick up centaur.act and new scomdef files

new bbuild will be b0330a_1213.810
RTC: 38362

Change-Id: I4ee508d8a77efea8b49f013ea207e64c8362786c
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/789
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 1 insertions, 55 deletions

diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index f1015b494..c5a5e3adb 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips810/Builds/b0326a_1211.810
+/esw/fips810/Builds/b0330a_1213.810
diff --git a/src/build/citest/etc/patches/centaur.act b/src/build/citest/etc/patches/centaur.act
deleted file mode 100644
index f0e4a92c8..000000000
--- a/src/build/citest/etc/patches/centaur.act
+++ /dev/null
@@ -1,42 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG 
-# This is an automatically generated prolog. 
-#  
-# fips760 src/simu/data/cec-chip/centaur.act 1.1 
-#  
-# IBM CONFIDENTIAL 
-#  
-# OBJECT CODE ONLY SOURCE MATERIALS 
-#  
-# COPYRIGHT International Business Machines Corp. 2005,2011 
-# All Rights Reserved 
-#  
-# The source code for this program is not published or otherwise 
-# divested of its trade secrets, irrespective of what has been 
-# deposited with the U.S. Copyright Office. 
-#  
-# IBM_PROLOG_END_TAG 
-#  Flag  PTR/DCR#  Userid    Date      Description
-#  LAST_VERSION_FROM_CC: 
-# $Source: fips760 fsp/src/simu/data/cec-chip/centaur.act 1$
-
-#  ----  --------  --------  --------  -----------
-#********************************************************************
-#  jr01  swxxxxxx  jrost     09/29/11  File creation from supernova 
-#********************************************************************
-#  
-
-CAUSE_EFFECT {
-  LABEL=[MBA01_MSS_CCS_START]
-  WATCH=[REG(0x030106A5)]  # CCS_CNTLQ_AB_REG
-  CAUSE: TARGET=[REG(0x030106A5)] OP=[BIT,ON] BIT=[0] # Set Start bit
-  EFFECT: TARGET=[REG(0x030106A5)] OP=[BIT,OFF] BIT=[0] # Selfclear Start bit
-  EFFECT: TARGET=[REG(0x030106A6)] OP=[BIT,ON] BIT=[1] # Set Done bit
-}
-
-CAUSE_EFFECT {
-  LABEL=[MBA23_MSS_CCS_START]
-  WATCH=[REG(0x03010EA5)]  # CCS_CNTLQ_AB_REG
-  CAUSE: TARGET=[REG(0x03010EA5)] OP=[BIT,ON] BIT=[0] # Set Start bit
-  EFFECT: TARGET=[REG(0x03010EA5)] OP=[BIT,OFF] BIT=[0] # Selfclear Start bit
-  EFFECT: TARGET=[REG(0x03010EA6)] OP=[BIT,ON] BIT=[1] # Set Done bit
-}
diff --git a/src/build/citest/etc/patches/patchlist.txt b/src/build/citest/etc/patches/patchlist.txt
index de26a64f9..e69de29bb 100644
--- a/src/build/citest/etc/patches/patchlist.txt
+++ b/src/build/citest/etc/patches/patchlist.txt
@@ -1,7 +0,0 @@
-Update centaur.act for running DRAM hardware procedures
--RTC: Story 38362 will be used to remove the patch
--CQ: SW127616
--Files: centaur.act
--Coreq: the file is copied in place by the workarounds.presimsetup
-
-
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index fe2d22234..1e0e43d13 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -54,11 +54,6 @@ sed -i -e's/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE.*/SETENV GFW_SIMICS_ENV_THREA
 #echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo
 #echo "WSALIAS HOSTBOOT_LEVEL SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo
 
-echo "+++ Copy new centaur.act for DRAM hardware procedures."
-mkdir -p $sb/simu/data/cec-chip/
-cp $HOSTBOOTROOT/src/build/citest/etc/patches/centaur.act $sb/simu/data/cec-chip/
-#fixme with Story 38362
-
 # Leaving this here as an example for the future
 echo "+++ Update to new phyp and mambo level."
 mkdir -p $sb/simu/data