From 1a910edfbf56f798e7656de33d12a4161f8ff141 Mon Sep 17 00:00:00 2001 From: BonnieLo-wiwynn Date: Mon, 6 Feb 2023 13:43:45 +0800 Subject: 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 --- meta-google/recipes-google/systemd/files/40-system.conf | 4 ---- meta-google/recipes-google/systemd/gbmc-systemd-config.bb | 5 ----- 2 files changed, 9 deletions(-) delete mode 100644 meta-google/recipes-google/systemd/files/40-system.conf (limited to 'meta-google') diff --git a/meta-google/recipes-google/systemd/files/40-system.conf b/meta-google/recipes-google/systemd/files/40-system.conf deleted file mode 100644 index 19347e90aa..0000000000 --- a/meta-google/recipes-google/systemd/files/40-system.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Manager] -DefaultMemoryAccounting=yes -RuntimeWatchdogSec=120s -WatchdogDevice=/dev/watchdog diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb index feb023bebb..4a6f194740 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 @@ SRC_URI:append = " \ 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 @@ do_install() { 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/ } -- cgit v1.2.3