summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-romulus/recipes-phosphor/state
diff options
context:
space:
mode:
authorDave Cobbley <david.j.cobbley@linux.intel.com>2018-08-23 04:40:54 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-08-23 19:39:42 +0300
commit194ff4f1f5d44b12e9cb06ddafa6adb20174a13c (patch)
tree823835cd29daf8901a31ac14c7e6534abf199be3 /meta-ibm/meta-romulus/recipes-phosphor/state
parent4feb727cd6b77a68bdaca63e121b378d814f5eaf (diff)
downloadopenbmc-194ff4f1f5d44b12e9cb06ddafa6adb20174a13c.tar.xz
[Subtree] Bring openbmc machines to top level
The new subtree model brings the subtrees up from the openbmc-machines layer. Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0 Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-romulus/recipes-phosphor/state')
-rw-r--r--meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend1
-rw-r--r--meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf3
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend
new file mode 100644
index 000000000..4db6f3a6d
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf
new file mode 100644
index 000000000..ad50cf698
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf
@@ -0,0 +1,3 @@
+# Sleep 8 seconds on Romulus to make sure the checkstop status on
+# CPU is cleared. See https://github.com/openbmc/openbmc/issues/3330
+REBOOT_DELAY=8