Move bbuild to b0813a_1832.930

Change-Id: I26cda4212af7aaee0d85e38faa268625df0922ef
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65382
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 3 insertions, 55 deletions

diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 5d549ca19..a49315d35 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips930/Builds/b0731a_1832.930
+/esw/fips930/Builds/b0813a_1832.930
diff --git a/src/build/citest/etc/patches/centaur_memory.act.patch b/src/build/citest/etc/patches/centaur_memory.act.patch
deleted file mode 100644
index 6cd8fb81e..000000000
--- a/src/build/citest/etc/patches/centaur_memory.act.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- centaur_memory.act	2018-06-29 08:37:30.899467931 -0500
-+++ centaur_memory.act.new	2018-06-29 08:37:01.321543963 -0500
-@@ -431,7 +431,7 @@
-  CAUSE: TARGET=[REG(0x0301060B)] OP=[BIT,ON] BIT=[0] # if the start maintenance command is on
-  CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,OFF] BIT=[59] # ERR constant
-  CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,ON] BIT=[40] # PORT0 CAS inject
--# CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,ON] BIT=[51] # Wait time
-+ CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,ON] BIT=[51] # Wait time
- 
-  EFFECT: TARGET=[REG(0x02011440)] OP=[BIT,ON] BIT=[45]  # Parity error on
-  # Then, disable all of our injects
-@@ -458,7 +458,7 @@
-  CAUSE: TARGET=[REG(0x0301060B)] OP=[BIT,ON] BIT=[0] # if the start maintenance command is on
-  CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,OFF] BIT=[59] # ERR constant
-  CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,ON] BIT=[42] # PORT1 CAS inject
--# CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,ON] BIT=[51] # Wait time
-+ CAUSE: TARGET=[REG(0x03010413)] OP=[BIT,ON] BIT=[51] # Wait time
- 
-  EFFECT: TARGET=[REG(0x02011440)] OP=[BIT,ON] BIT=[45]  # Parity error on
-  # Then, disable all of our injects
-@@ -485,7 +485,7 @@
-  CAUSE: TARGET=[REG(0x03010E0B)] OP=[BIT,ON] BIT=[0] # if the start maintenance command is on
-  CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,OFF] BIT=[59] # ERR constant
-  CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,ON] BIT=[40] # PORT2 CAS inject
-- #CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,ON] BIT=[51] # Wait time
-+ CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,ON] BIT=[51] # Wait time
- 
-  EFFECT: TARGET=[REG(0x02011480)] OP=[BIT,ON] BIT=[45]  # Parity error on
-  # Then, disable all of our injects
-@@ -512,7 +512,7 @@
-  CAUSE: TARGET=[REG(0x03010E0B)] OP=[BIT,ON] BIT=[0] # if the start maintenance command is on
-  CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,OFF] BIT=[59] # ERR constant
-  CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,ON] BIT=[42] # PORT3 CAS inject
--# CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,ON] BIT=[51] # Wait time
-+ CAUSE: TARGET=[REG(0x03010C13)] OP=[BIT,ON] BIT=[51] # Wait time
- 
-  EFFECT: TARGET=[REG(0x02011480)] OP=[BIT,ON] BIT=[45]  # Parity error on
-  # Then, disable all of our injects
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index 8708e2b03..32523a5a9 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -32,18 +32,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
-echo "+++ Removing test code from centaur_memory.act"
-mkdir -p $sb/simu/data/cec-chip
-cp $BACKING_BUILD/src/simu/data/cec-chip/centaur_memory.act $sb/simu/data/cec-chip
-chmod 777 $sb/simu/data/cec-chip/centaur_memory.act
-patch -p0 $sb/simu/data/cec-chip/centaur_memory.act $PROJECT_ROOT/src/build/citest/etc/patches/centaur_memory.act.patch
 
 
 ##########################################################################
-echo "+++ SBE support for Cumulus DD1.3 +++"
-#Pull in the code
-sbex -t 1060757
-#Build sbei to create p9c_13.sbe_seeprom.hdr.bin
-mkdir -p $sb/sbei/sbfw/
-cd $sb/sbei/sbfw/
-mk
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 08da3baed..49ae0afdc 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -36,17 +36,15 @@
 #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo
 
 ##########################################################################
-echo "+++ Update standalone configs to use modern proc levels +++"
-sbex -t 1063108
-
-echo "+++ Need to alter where we look for pnor images so they will be picked up properly"
 mkdir -p  $sb/simu/data
 
+
 ###############################################################################
 ### NOTE - if you need to sbex a simicsInfo track it needs to be done BEFORE
 ###        executing the code below
 ### NOTE - these lines are permanent to allow external PNOR testing
 ###############################################################################
+echo "+++ Need to alter where we look for pnor images so they will be picked up properly"
 cp $bb/src/simu/data/simicsInfo $sb/simu/data/
 chmod +w $sb/simu/data/simicsInfo
 egrep -v "nimbus.pnor|cumulus.pnor|cumulus_cdimm.pnor" $sb/simu/data/simicsInfo > $sb/simu/data/simicsInfo.new