summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThi Tran <thi@us.ibm.com>2011-08-15 12:25:09 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2011-08-16 08:28:41 -0500
commit97c63f858a9119e2f20bb132a486bfd042746c5d (patch)
tree74485faf27053d4b3114b461e5b8fed27a2b3937 /src
parent82fa7a749fbd1d8f17891dbd97b17a3bdae36c53 (diff)
downloadtalos-hostboot-97c63f858a9119e2f20bb132a486bfd042746c5d.tar.gz
talos-hostboot-97c63f858a9119e2f20bb132a486bfd042746c5d.zip
Update to FipS build b0812a_1134.750
Change-Id: I38597b739d2f8e6709c4474f018d8d7aaa8cd904 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/257 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/build/citest/etc/bbuild2
-rwxr-xr-xsrc/build/citest/etc/workarounds11
2 files changed, 3 insertions, 10 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index ff74cb43d..c3e824944 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips750/Builds/b0729a_1132.750
+/esw/fips750/Builds/b0812a_1134.750
diff --git a/src/build/citest/etc/workarounds b/src/build/citest/etc/workarounds
index 5e55e98e8..f92b381d8 100755
--- a/src/build/citest/etc/workarounds
+++ b/src/build/citest/etc/workarounds
@@ -1,18 +1,11 @@
#!/bin/sh
-# This workaround is fixed in b0722a_1132.750 according to Ched."
-#echo "+++ Workaround for SMM error starting simics."
-#/afs/rchland/usr2/ched/public/hostboot/fix_ph110510.sh
-
echo "+++ Copy desired SALERNO config file to sandbox and modify L3 to 8MB."
mkdir -p $sb/simu/configs
cp $BACKING_BUILD/src/simu/configs/P8_SALERNO.config $sb/simu/configs
sed -i -e's/SETENV GFW_P8_SALERNO_L3_MB_SIZE.*/SETENV GFW_P8_SALERNO_L3_MB_SIZE 8/' $sb/simu/configs/P8_SALERNO.config
-sed -i -e's/SETENV GFW_P8_SALERNO_MODEL_EC.*/SETENV GFW_P8_SALERNO_MODEL_EC 910431/' $sb/simu/configs/P8_SALERNO.config
-
-echo "+++ Copy in the P8 scomdef."
-mkdir -p $sb/engd/scomdef
-cp /gsa/ausgsa/home/a/n/andrewg/web/public/hostboot/simics/p8_910431.scomdef $sb/engd/scomdef/
+# Backing build already contains 910431. Leave this workaround here for future scomdef files
+#sed -i -e's/SETENV GFW_P8_SALERNO_MODEL_EC.*/SETENV GFW_P8_SALERNO_MODEL_EC 910431/' $sb/simu/configs/P8_SALERNO.config
echo "+++ Patch for PHYP flight recorder."
sed -i -e's/.*PHYPLEVEL.*//' $sb/../simics/.simics_flightrecorder
OpenPOWER on IntegriCloud