meta-phosphor: support hardware watchdog
Support hardware watchdog for openbmc. Added systemd config to
enable '/dev/watchdog'.
Tested: tested and verified on greatlakes platform.
Change-Id: Ic46bcd9b8576530be7dcdda51384e1052d4a78f1
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
index feb023b..4a6f194 100644
--- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
+++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
@@ -11,14 +11,12 @@
file://firmware-updates.target \
file://firmware-updates-pre.target \
file://40-gbmc-forward.conf \
- file://40-system.conf \
file://40-gbmc-time.conf \
"
FILES:${PN}:append = " \
${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \
${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \
- ${systemd_unitdir}/system.conf.d/40-system.conf \
${systemd_unitdir}/timesyncd.conf.d/40-gbmc-time.conf \
${libdir}/sysctl.d/40-gbmc-forward.conf \
"
@@ -49,9 +47,6 @@
install -d -m0755 ${D}${libdir}/sysctl.d
install -m 0644 ${WORKDIR}/40-gbmc-forward.conf ${D}${libdir}/sysctl.d/
- install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/
- install -D -m0644 ${WORKDIR}/40-system.conf ${D}${systemd_unitdir}/system.conf.d/
-
install -d -m 0755 ${D}${systemd_unitdir}/timesyncd.conf.d/
install -D -m0644 ${WORKDIR}/40-gbmc-time.conf ${D}${systemd_unitdir}/timesyncd.conf.d/
}
diff --git a/meta-google/recipes-google/systemd/files/40-system.conf b/meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf
similarity index 68%
rename from meta-google/recipes-google/systemd/files/40-system.conf
rename to meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf
index 19347e9..c323a22 100644
--- a/meta-google/recipes-google/systemd/files/40-system.conf
+++ b/meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf
@@ -1,4 +1,3 @@
[Manager]
-DefaultMemoryAccounting=yes
RuntimeWatchdogSec=120s
WatchdogDevice=/dev/watchdog
diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
index 847d324..eab2ad4 100644
--- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
@@ -25,6 +25,19 @@
${exec_prefix}/lib/systemd/catalog/*.*.catalog \
"
+SRC_URI:append = " \
+ file://40-hardware-watchdog.conf \
+ "
+
+FILES:${PN}:append = " \
+ ${systemd_unitdir}/system.conf.d/40-hardware-watchdog.conf \
+ "
+
+do_install:append() {
+ install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/
+ install -m 0644 ${WORKDIR}/40-hardware-watchdog.conf ${D}${systemd_unitdir}/system.conf.d/
+}
+
# udev is added to the USERADD_PACKAGES due to some 'render' group
# being necessary to create for /dev/dri handling, which we don't
# have to worry about. A side-effect of this is udev would RDEPEND on