Update bbuild to b0611c_1223.810

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

6 files changed, 7 insertions, 155 deletions

diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 7d534512b..e74585033 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips810/Builds/b0604a_1221.810
+/esw/fips810/Builds/b0611c_1223.810
diff --git a/src/build/citest/etc/patches/centaur.act b/src/build/citest/etc/patches/centaur.act
deleted file mode 100644
index c93f0fa7e..000000000
--- a/src/build/citest/etc/patches/centaur.act
+++ /dev/null
@@ -1,101 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG 
-# This is an automatically generated prolog. 
-#  
-# fips810 src/simu/data/cec-chip/centaur.act 1.4 
-#  
-# IBM CONFIDENTIAL 
-#  
-# OBJECT CODE ONLY SOURCE MATERIALS 
-#  
-# COPYRIGHT International Business Machines Corp. 2005,2012 
-# 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 
-#        SW127616  vanlee    03/20/12  Actions for draminit HWPs
-#        SW134334  vanlee    04/09/12  startclocks and chipID actions
-#        SW139623  vanlee    05/04/12  centaur startclocks actions
-#********************************************************************
-#  
-
-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
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0000C019)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F000)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0000C018)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 00000000)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0001C019)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F000)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0001C018)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 00000000)]
-}
-
-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
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0000C019)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F000)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0000C018)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 00000000)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0001C019)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F000)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0001C018)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 00000000)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[DP18 and AD32S PLL lock for MBA0 Port0]
-  WATCH=[INDSCOM_0x0301143F(0x0000C00E)]  # Deassert PLL Reset
-  CAUSE: TARGET=[INDSCOM_0x0301143F(0x0000C00E)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 00004000)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0000C000)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F800)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0000C001)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000C000)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[DP18 and AD32S PLL lock for MBA0 Port1]
-  WATCH=[INDSCOM_0x0301143F(0x0001C00E)]  # Deassert PLL Reset
-  CAUSE: TARGET=[INDSCOM_0x0301143F(0x0001C00E)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 00004000)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0001C000)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F800)]
-  EFFECT: TARGET=[INDSCOM_0x0301143F(0x0001C001)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000C000)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[DP18 and AD32S PLL lock for MBA1 Port0]
-  WATCH=[INDSCOM_0x0301183F(0x0000C00E)]  # Deassert PLL Reset
-  CAUSE: TARGET=[INDSCOM_0x0301183F(0x0000C00E)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 00004000)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0000C000)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F800)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0000C001)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000C000)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[DP18 and AD32S PLL lock for MBA1 Port1]
-  WATCH=[INDSCOM_0x0301183F(0x0001C00E)]  # Deassert PLL Reset
-  CAUSE: TARGET=[INDSCOM_0x0301183F(0x0001C00E)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 00004000)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0001C000)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000F800)]
-  EFFECT: TARGET=[INDSCOM_0x0301183F(0x0001C001)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00000000 0000C000)]
-}
-
-CAUSE_EFFECT {
-  # copy chip ID
-  LABEL=[DEVICE_ID_REG] # TPTOP.PIB.PCBMS.DEVICE_ID_REG
-  WATCH_READ=[REG(0x000F000F)]  # if someone reads this
-  # No cause since we always want this behavior
-  EFFECT: TARGET=[REG(0x000F000F)] OP=[EQUALTO,BUF] DATA=[LOGIC(0xFF000009)] # copy over
-}
-
-CAUSE_EFFECT {
-  LABEL=[START_CLOCKS]
-  WATCH=[REG(0x03030006)]  # CC_REGION_REG
-  CAUSE: TARGET=[REG(0x03030006)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,4FE00600,00000000)]
-  EFFECT: TARGET=[REG(0x03030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,0000001F FFFFFFFF)]
-}
-
diff --git a/src/build/citest/etc/patches/patchlist.txt b/src/build/citest/etc/patches/patchlist.txt
index d5557a939..e69de29bb 100644
--- a/src/build/citest/etc/patches/patchlist.txt
+++ b/src/build/citest/etc/patches/patchlist.txt
@@ -1,12 +0,0 @@
-Need to pick up latest model EC for p8 and centaur
--RTC: task 41342 will be used to remove the patch
--CMVC: Defect 834168 for checking in the changes into fips810
--Files: P8_MURANO.config
--Coreq: associated changes in workarounds.presimsetup need to be removed.
-
-Centaur action for cen_mem_startclocks HWP
--RTC: task 41342 will be used to remove the patch
--CQ: SW139623
--CMVC: Defect 834703 for checking in the changes into fips810
--Files: centaur.act
--Coreq: associated changes in workarounds.presimsetup need to be removed.
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index fa77253c3..04c47e541 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -2,11 +2,11 @@
 #  IBM_PROLOG_BEGIN_TAG
 #  This is an automatically generated prolog.
 #
-#  $Source: src/build/citest/etc/workarounds.postsim $
+#  $Source: src/build/citest/etc/workarounds.postsimsetup $
 #
 #  IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+#  COPYRIGHT International Business Machines Corp. 2011-2012
 #
 #  p1
 #
@@ -20,36 +20,9 @@
 #
 #  Origin: 30
 #
-#  IBM_PROLOG_END
-
+#  IBM_PROLOG_END_TAG
 ##
 ## Workarounds that are run after start_simics is executed for the first time
 ##    to setup the sandbox
 ##
-#####
-#@fixme - Fix with RTC:41342
-echo "+++ Copy centaur.act"
-mkdir -p $sb/simu/data/cec-chip
-cp $HOSTBOOTROOT/src/build/citest/etc/patches/centaur.act $sb/simu/data/cec-chip/centaur.act
-#####
-
-#####
-#@fixme - Fix with RTC:41342
-echo "+++ Update Model EC."
-mkdir -p $sb/simu/configs/
-
-cp --update $bb/src/simu/configs/P8_MURANO.config $sb/simu/configs/P8_MURANO.config
-sed -i -e's/SETENV GFW_P8_MURANO_PROC_MODEL_EC.*/SETENV GFW_P8_MURANO_PROC_MODEL_EC 910623/' $sb/simu/configs/P8_MURANO.config
-sed -i -e's/SETENV GFW_P8_MURANO_CENTAUR_MODEL_EC.*/SETENV GFW_P8_MURANO_CENTAUR_MODEL_EC 910610/' $sb/simu/configs/P8_MURANO.config
-
-cp --update $bb/src/simu/configs/P8_VENICE.config $sb/simu/configs/P8_VENICE.config
-sed -i -e's/SETENV GFW_P8_VENICE_PROC_MODEL_EC.*/SETENV GFW_P8_VENICE_PROC_MODEL_EC 910623/' $sb/simu/configs/P8_VENICE.config
-#####
 
-#####
-#@fixme - Fix with RTC:41205
-echo "+++ Fix centaur aliases in p8.act (SW141619) +++"
-mkdir -p $sb/simu/data/cec-chip/
-cp --update $bb/src/simu/data/cec-chip/p8.act $sb/simu/data/cec-chip/
-sed -i -e's/mycentaur/mymcPort/' $sb/simu/data/cec-chip/p8.act
-#####
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 049996a1e..7250e50f9 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -2,11 +2,11 @@
 #  IBM_PROLOG_BEGIN_TAG
 #  This is an automatically generated prolog.
 #
-#  $Source: src/build/citest/etc/workarounds.presim $
+#  $Source: src/build/citest/etc/workarounds.presimsetup $
 #
 #  IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+#  COPYRIGHT International Business Machines Corp. 2011-2012
 #
 #  p1
 #
@@ -20,20 +20,13 @@
 #
 #  Origin: 30
 #
-#  IBM_PROLOG_END
-
+#  IBM_PROLOG_END_TAG
 ##
 ## Workarounds that are run before start_simics is executed for the first time
 ##    to setup the sandbox
 ##
 
 
-echo "+++ Updates for memory map."
-mkdir -p $sb/simu/data
-egrep -v "WSALIAS DEFAULT FIPSLEVEL|WSALIAS DEFAULT PHYPLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
-echo "WSALIAS DEFAULT FIPSLEVEL env/gfwd/simics-4.2.0/simics-4.2.85/fips/fld36/fi120530c700.42" >> $sb/simu/data/simicsInfo
-echo "WSALIAS DEFAULT PHYPLEVEL env/phypb/simics-4.2.0/simics-4.2.85/ph120531a700.42" >> $sb/simu/data/simicsInfo
-
 #### Examples ####
 #echo "+++ Some message about why you need to do this."
 #mkdir -p $sb/simu/data
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index ad178ef91..e57dd7e47 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -36,7 +36,6 @@ try {
 
 ########################### WORKAROUNDS ####################################
 # Setup the mailbox.
-venice_cec_chip_cmp0.psi_hb->psihb_psihbcr=0x5f00000000000000
 # for mbox on core 0 use:
 # venice_cec_chip_cmp0.psi_hb->psihb_xivr_fsi=0x0140000000     #02010917
 # for mbox on core 5 use: