P8_MURANO.config does not pick up latest Model EC for p8 and centaur

Change-Id: Icab145ce932ff77e8a84e6bdf58709b04feb5c37
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/976
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 33 insertions, 283 deletions

diff --git a/src/build/citest/etc/patches/centaur.act b/src/build/citest/etc/patches/centaur.act
index 87130e857..c93f0fa7e 100644
--- a/src/build/citest/etc/patches/centaur.act
+++ b/src/build/citest/etc/patches/centaur.act
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG 
 # This is an automatically generated prolog. 
 #  
-# fips810 src/simu/data/cec-chip/centaur.act 1.3 
+# fips810 src/simu/data/cec-chip/centaur.act 1.4 
 #  
 # IBM CONFIDENTIAL 
 #  
@@ -24,6 +24,7 @@
 #  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
 #********************************************************************
 #  
 
@@ -90,3 +91,11 @@ CAUSE_EFFECT {
   # 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/p8.act b/src/build/citest/etc/patches/p8.act
deleted file mode 100644
index 16d437a55..000000000
--- a/src/build/citest/etc/patches/p8.act
+++ /dev/null
@@ -1,246 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG 
-# This is an automatically generated prolog. 
-#  
-# fips810 src/simu/data/cec-chip/p8.act 1.2 
-#  
-# Licensed Materials - Property of IBM 
-#  
-# Restricted Materials of IBM 
-#  
-# COPYRIGHT International Business Machines Corp. 2005,2012 
-# All Rights Reserved 
-#  
-# US Government Users Restricted Rights - Use, duplication or 
-# disclosure restricted by GSA ADP Schedule Contract with IBM Corp. 
-#  
-# IBM_PROLOG_END_TAG 
-#
-#  LAST_VERSION_FROM_CC: 
-# $Source: fips740 fsp/src/simu/data/cec-chip/p8.act 1$
-
-#  Flag  PTR/DCR#  Userid    Date      Description
-#  ----  --------  --------  --------  -----------
-#        SW072792  ched      05/11/11  File Created 
-#        SW120884  vanlee    02/01/12  framelock and io_run_training actions
-#        SW134334  vanlee    04/09/12  startclocks and chipID actions
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI0]
-  WATCH=[REG(0x0201184A)]  # MCI0_CFG_REG
-  CAUSE: TARGET=[REG(0x0201184A)] OP=[BIT,ON] BIT=[7] # MCI0_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x0201184B)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur0)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI0]
-  WATCH=[REG(0x0201184A)]  # MCI0_CFG_REG
-  CAUSE: TARGET=[REG(0x0201184A)] OP=[BIT,ON] BIT=[8] # MCI0_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x0201184B)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur0)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI1]
-  WATCH=[REG(0x020118CA)]  # MCI1_CFG_REG
-  CAUSE: TARGET=[REG(0x020118CA)] OP=[BIT,ON] BIT=[7] # MCI1_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x020118CB)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur1)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI1]
-  WATCH=[REG(0x020118CA)]  # MCI1_CFG_REG
-  CAUSE: TARGET=[REG(0x020118CA)] OP=[BIT,ON] BIT=[8] # MCI1_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x020118CB)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur1)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI2]
-  WATCH=[REG(0x0201194A)]  # MCI2_CFG_REG
-  CAUSE: TARGET=[REG(0x0201194A)] OP=[BIT,ON] BIT=[7] # MCI2_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x0201194B)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur2)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI2]
-  WATCH=[REG(0x0201194A)]  # MCI2_CFG_REG
-  CAUSE: TARGET=[REG(0x0201194A)] OP=[BIT,ON] BIT=[8] # MCI2_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x0201194B)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur2)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI3]
-  WATCH=[REG(0x020119CA)]  # MCI3_CFG_REG
-  CAUSE: TARGET=[REG(0x020119CA)] OP=[BIT,ON] BIT=[7] # MCI3_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x020119CB)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur3)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI3]
-  WATCH=[REG(0x020119CA)]  # MCI3_CFG_REG
-  CAUSE: TARGET=[REG(0x020119CA)] OP=[BIT,ON] BIT=[8] # MCI3_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x020119CB)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur3)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI4]
-  WATCH=[REG(0x02011C4A)]  # MCI4_CFG_REG
-  CAUSE: TARGET=[REG(0x02011C4A)] OP=[BIT,ON] BIT=[7] # MCI4_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x02011C4B)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur4)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI4]
-  WATCH=[REG(0x02011C4A)]  # MCI4_CFG_REG
-  CAUSE: TARGET=[REG(0x02011C4A)] OP=[BIT,ON] BIT=[8] # MCI4_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x02011C4B)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur4)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI5]
-  WATCH=[REG(0x02011CCA)]  # MCI5_CFG_REG
-  CAUSE: TARGET=[REG(0x02011CCA)] OP=[BIT,ON] BIT=[7] # MCI5_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x02011CCB)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur5)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI5]
-  WATCH=[REG(0x02011CCA)]  # MCI5_CFG_REG
-  CAUSE: TARGET=[REG(0x02011CCA)] OP=[BIT,ON] BIT=[8] # MCI5_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x02011CCB)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur5)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI6]
-  WATCH=[REG(0x02011D4A)]  # MCI6_CFG_REG
-  CAUSE: TARGET=[REG(0x02011D4A)] OP=[BIT,ON] BIT=[7] # MCI6_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x02011D4B)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur6)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI6]
-  WATCH=[REG(0x02011D4A)]  # MCI6_CFG_REG
-  CAUSE: TARGET=[REG(0x02011D4A)] OP=[BIT,ON] BIT=[8] # MCI6_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x02011D4B)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur6)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock MCI7]
-  WATCH=[REG(0x02011DCA)]  # MCI7_CFG_REG
-  CAUSE: TARGET=[REG(0x02011DCA)] OP=[BIT,ON] BIT=[7] # MCI7_CFG_REG[7] - Start Frame Lock
-  EFFECT: TARGET=[REG(0x02011DCB)] OP=[BIT,ON] BIT=[0] # MCI_STAT_REG  - Frame Lock Pass
-  EFFECT: TARGET=[ALIAS(mycentaur7)REG(0x0201080B)] OP=[BIT,ON] BIT=[0] # MBI_STAT_REG  - Frame Lock Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[Framelock Frtl MCI7]
-  WATCH=[REG(0x02011DCA)]  # MCI7_CFG_REG
-  CAUSE: TARGET=[REG(0x02011DCA)] OP=[BIT,ON] BIT=[8] # MCI7_CFG_REG[8] - Start Frame Lock Frtl
-  EFFECT: TARGET=[REG(0x02011DCB)] OP=[BIT,ON] BIT=[2] # MCI_STAT_REG  - Frame Lock Frtl Pass
-  EFFECT: TARGET=[ALIAS(mycentaur7)REG(0x0201080B)] OP=[BIT,ON] BIT=[2] # MBI_STAT_REG  - Frame Lock Frtl Pass
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS0]
-  WATCH=[INDSCOM_0x02011A3F(0x00088060)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur0)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088060)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088860)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS1]
-  WATCH=[INDSCOM_0x02011A3F(0x00088040)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur1)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088040)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088840)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS2]
-  WATCH=[INDSCOM_0x02011A3F(0x00088020)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur2)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088020)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088820)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS3]
-  WATCH=[INDSCOM_0x02011A3F(0x00088000)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur3)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088800)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS4]
-  WATCH=[INDSCOM_0x02011E3F(0x00088060)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur4)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088060)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS5]
-  WATCH=[INDSCOM_0x02011E3F(0x00088040)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur5)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088040)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS6]
-  WATCH=[INDSCOM_0x02011E3F(0x00088020)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur6)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088020)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[IO_run_training for MCS7]
-  WATCH=[INDSCOM_0x02011E3F(0x00088000)]  # start trigger register
-  CAUSE: TARGET=[ALIAS(mycentaur7)INDSCOM_0x0201043F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF0]
-  CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088000)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,00000000 0000F800)] MASK=[LITERAL(64,00000000 0000FFFF)]
-  EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[EQUALTO,BUFSTRING] DATA=[LITERAL(64,00000000 0000F800)]
-}
-
-CAUSE_EFFECT {
-  # copy chip ID
-  LABEL=[DEVICE_ID_REG] # EH.TPCHIP.PIB.PCBMS.DEVICE_ID_REG
-  WATCH_READ=[REG(0x000F000F)] # if someone read 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 on X bus]
-  WATCH=[REG(0x04030006)]  # start clocks register
-  CAUSE: TARGET=[REG(0x04030006)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,4FE00E00 00000000)] MASK=[LITERAL(64,FF800E00 000000000]
-  EFFECT: TARGET=[REG(0x04030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,0000001F FFFFFFFF)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[Start_clocks on A bus]
-  WATCH=[REG(0x09030006)]  # start clocks register
-  CAUSE: TARGET=[REG(0x09030006)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,4FE00E00 00000000)] MASK=[LITERAL(64,FF800E00 000000000]
-  EFFECT: TARGET=[REG(0x09030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,000007FF FFFFFFFF)]
-}
-
-CAUSE_EFFECT {
-  LABEL=[Start_clocks on Pcie bus]
-  WATCH=[REG(0x08030006)]  # start clocks register
-  CAUSE: TARGET=[REG(0x08030006)] OP=[EQUALTO,BUF,MASK] DATA=[LITERAL(64,4FE00E00 00000000)] MASK=[LITERAL(64,FF800E00 000000000]
-  EFFECT: TARGET=[REG(0x08030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,000007FF FFFFFFFF)]
-}
diff --git a/src/build/citest/etc/patches/p8murano.ali b/src/build/citest/etc/patches/p8murano.ali
deleted file mode 100644
index 6a9b39b41..000000000
--- a/src/build/citest/etc/patches/p8murano.ali
+++ /dev/null
@@ -1,32 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG 
-# This is an automatically generated prolog. 
-#  
-# fips810 src/simu/data/cec-chip/p8murano.ali 1.1 
-#  
-# 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
-#  ----  --------  --------  --------  -----------
-#  ch99  SW115693  ched      12/22/11  Created from Venice
-#        SW134334  vanlee    04/09/12  startclocks and chipID actions
-
-# P8 Murano aliases
-
-membuf:n0:p0 |  myproc=proc:n0:p0
-membuf:n0:p1 |  myproc=proc:n0:p0
-membuf:n0:p2 |  myproc=proc:n0:p0
-membuf:n0:p3 |  myproc=proc:n0:p0
-
-proc:n0:p0 | mycentaur4=membuf:n0:p0 mycentaur5=membuf:n0:p1 mycentaur6=membuf:n0:p2 mycentaur7=membuf:n0:p3
-
-END
diff --git a/src/build/citest/etc/patches/patchlist.txt b/src/build/citest/etc/patches/patchlist.txt
index 843cb5f9e..d5557a939 100644
--- a/src/build/citest/etc/patches/patchlist.txt
+++ b/src/build/citest/etc/patches/patchlist.txt
@@ -1,5 +1,12 @@
-Add chipid and startclocks_chiplets action
--RTC: task 40101 will be used to remove the patch
--CMVC: Defect 831420 was used to check the changes into fips810
--Files: p8.act , centaur.act, p8murano.ali
+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.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index ba1618e70..265862240 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -27,6 +27,18 @@
 ##    to setup the sandbox
 ##
 
+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
+
+echo "+++ Copy desired config file to sandbox and modify Model EC."
+mkdir -p $sb/simu/configs
+cp --update $BACKING_BUILD/src/simu/configs/P8_MURANO.config $sb/simu/configs
+cp --update $BACKING_BUILD/src/simu/configs/P8_VENICE.config $sb/simu/configs
+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
+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
+
 echo "+++ Enable 8-threads."
 sed -i -e's/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE.*/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE 8/' $sb/simu/configs/P8_VENICE.config
 sed -i -e's/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE.*/SETENV GFW_SIMICS_ENV_THREADS_PER_CORE 8/' $sb/simu/configs/P8_MURANO.config