summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Cain <cjcain@us.ibm.com>2017-10-20 10:56:02 -0500
committerChristopher J. Cain <cjcain@us.ibm.com>2017-10-20 12:13:19 -0400
commit6404302e1b1eae001edcec4a5c8e4c4ce5cdaaa3 (patch)
tree699ffa218bb123af5ccb6ec6f0776bb11fd962f9
parentbacb45ad1cc0da113290f0e169c33e5f0885c171 (diff)
downloadtalos-occ-6404302e1b1eae001edcec4a5c8e4c4ce5cdaaa3.tar.gz
talos-occ-6404302e1b1eae001edcec4a5c8e4c4ce5cdaaa3.zip
Prevent error when VRM temperature limit is not set
Change-Id: Iba0fe0222f26be4e9f09f1deff29dda227fdfe93 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48642 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
-rwxr-xr-xsrc/occ_405/amec/amec_health.c2
-rwxr-xr-xsrc/occ_405/occbuildname.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/occ_405/amec/amec_health.c b/src/occ_405/amec/amec_health.c
index fcc9698..f0b2609 100755
--- a/src/occ_405/amec/amec_health.c
+++ b/src/occ_405/amec/amec_health.c
@@ -1028,7 +1028,7 @@ void amec_health_check_vrm_vdd_temp(const sensor_t *i_sensor)
l_ot_error = g_amec->thermalvdd.ot_error;
// Check to see if we exceeded our error temperature
- if (i_sensor->sample > l_ot_error)
+ if ((l_ot_error != 0) && (i_sensor->sample > l_ot_error))
{
// Increment the error counter for this FRU
L_error_count++;
diff --git a/src/occ_405/occbuildname.c b/src/occ_405/occbuildname.c
index d075419..100ecb6 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_171020a\0" /*</BuildName>*/ ;
+volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_171020b\0" /*</BuildName>*/ ;
#endif
OpenPOWER on IntegriCloud