mboxd: mbox device is optional
The poorly-named mboxd daemon can now operate regardless of the
presence of /dev/aspeed-mbox. Particularly, OpenPOWER OpenBMC
configurations no-longer use this interface for the HIOMAP protocol
(it is now run over IPMI instead).
Remove hard dependencies on the presence of /dev/aspeed-mbox.
(From meta-phosphor rev: 3a63d14149a93e21218fc56c58a7fb7211758e88)
Change-Id: I43e5d2bf6acae47b93a8271c02097c7d1c5fa4b6
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
deleted file mode 100644
index 12e90d8..0000000
--- a/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="misc", KERNEL=="aspeed-mbox", TAG+="systemd"
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
index abc97e5..c491b18 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
@@ -2,8 +2,6 @@
Description=Phosphor MBOX Daemon
BindsTo=dev-aspeed\x2dlpc\x2dctrl.device
After=dev-aspeed\x2dlpc\x2dctrl.device
-BindsTo=dev-aspeed\x2dmbox.device
-After=dev-aspeed\x2dmbox.device
Requires=xyz.openbmc_project.Control.Host.service
After=xyz.openbmc_project.Control.Host.service
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
index e49daa1..884446b 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
@@ -16,7 +16,6 @@
SRC_URI += "git://github.com/openbmc/mboxbridge.git"
-SRC_URI += "file://99-aspeed-mbox.rules"
SRC_URI += "file://99-aspeed-lpc-ctrl.rules"
SRC_URI += "file://aspeed-lpc-ctrl-h.patch"
@@ -33,7 +32,6 @@
do_install_append() {
install -d ${D}/lib/udev/rules.d
- install -m 0644 ${WORKDIR}/99-aspeed-mbox.rules ${D}/lib/udev/rules.d
install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d
}