summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2017-02-07 12:55:25 -0600
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-02-07 19:51:07 +0000
commit48203e191c442909caa7b96c870c6d2304c7336d (patch)
treea9f9fa36fd4ca52a544bd44c73233ba2d055506b /meta-openbmc-machines
parent23e7fe1e980fae3325fd0bd8a467a5351a2d13e7 (diff)
downloadtalos-openbmc-48203e191c442909caa7b96c870c6d2304c7336d.tar.gz
talos-openbmc-48203e191c442909caa7b96c870c6d2304c7336d.zip
Zaius: Re-enable IPMI watchdog
Stop applying the patch to disable it. Change-Id: I4dc6c7acdce3bd3aa90969748aa9722ad8585d0d Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend
index 02b3b7348..5e8ab25fa 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend
@@ -1,2 +1 @@
-SRC_URI += "file://skeleton-0001-Temporarily-disable-watchdog-support.patch \
- file://skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch"
+SRC_URI += "file://skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch"
OpenPOWER on IntegriCloud