summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@us.ibm.com>2018-04-06 15:10:55 -0500
committerMartha Broyles <mbroyles@us.ibm.com>2018-04-10 10:49:21 -0400
commit437c820708081c4ccbb2ff9a7ad8205752caecdd (patch)
treec092f695c25bb21cc146a043384212a25fd97fb0
parentda6e77f81deb6d4d7b88c973be06d0008e01d01a (diff)
downloadtalos-occ-437c820708081c4ccbb2ff9a7ad8205752caecdd.tar.gz
talos-occ-437c820708081c4ccbb2ff9a7ad8205752caecdd.zip
OCC Centaur enable deadman timer
Change-Id: I3abbb39200670a7cba00f5d59d193aa8b0b485c0 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56898 Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
-rwxr-xr-xsrc/occ_405/cent/centaur_data.c2
-rwxr-xr-xsrc/occ_405/occbuildname.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/occ_405/cent/centaur_data.c b/src/occ_405/cent/centaur_data.c
index 9ee60b0..902f2c7 100755
--- a/src/occ_405/cent/centaur_data.c
+++ b/src/occ_405/cent/centaur_data.c
@@ -1066,7 +1066,7 @@ void centaur_init( void )
//set up the data bits
// TODO RTC 190643 disable until phyp has centaur support
- l_mbscfg.fields.occ_deadman_timer_sel = 0; // CENT_DEADMAN_TIMER_2SEC;
+ l_mbscfg.fields.occ_deadman_timer_sel = CENT_DEADMAN_TIMER_2SEC;
L_scomList[0].data = l_mbscfg.value;
/// Set up Centaur Scom Registers - array of Scoms
diff --git a/src/occ_405/occbuildname.c b/src/occ_405/occbuildname.c
index e980878..0e5dfeb 100755
--- a/src/occ_405/occbuildname.c
+++ b/src/occ_405/occbuildname.c
@@ -34,6 +34,6 @@ volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) =
#else
-volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_180409a\0" /*</BuildName>*/ ;
+volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_180410a\0" /*</BuildName>*/ ;
#endif
OpenPOWER on IntegriCloud