summaryrefslogtreecommitdiffstats
path: root/drivers/rpmsg/Makefile
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2020-04-22 17:37:35 -0700
committerBjorn Andersson <bjorn.andersson@linaro.org>2020-05-07 11:04:38 -0700
commit93bc3feee8bd5fbe29ad27779c5e7b369fd7c80b (patch)
treeadeedba4a17e6f3223da1ac19956d99d4105b2b8 /drivers/rpmsg/Makefile
parent5d1f2e3c8090c0769ee4a1b920e82277613327fc (diff)
downloadlinux-stable-93bc3feee8bd5fbe29ad27779c5e7b369fd7c80b.tar.gz
linux-stable-93bc3feee8bd5fbe29ad27779c5e7b369fd7c80b.tar.bz2
linux-stable-93bc3feee8bd5fbe29ad27779c5e7b369fd7c80b.zip
rpmsg: glink: Integrate glink_ssr in qcom_glink
In all but the very special case of a system with _only_ glink_rpm, GLINK is dependent on glink_ssr, so move it to rpmsg and combine it with qcom_glink_native in the new qcom_glink kernel module. Acked-by: Chris Lew <clew@codeaurora.org> Acked-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> Link: https://lore.kernel.org/r/20200423003736.2027371-4-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/rpmsg/Makefile')
-rw-r--r--drivers/rpmsg/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile
index ae92a7fb08f6..ffe932ef6050 100644
--- a/drivers/rpmsg/Makefile
+++ b/drivers/rpmsg/Makefile
@@ -2,8 +2,9 @@
obj-$(CONFIG_RPMSG) += rpmsg_core.o
obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o
obj-$(CONFIG_RPMSG_MTK_SCP) += mtk_rpmsg.o
+qcom_glink-objs := qcom_glink_native.o qcom_glink_ssr.o
+obj-$(CONFIG_RPMSG_QCOM_GLINK) += qcom_glink.o
obj-$(CONFIG_RPMSG_QCOM_GLINK_RPM) += qcom_glink_rpm.o
-obj-$(CONFIG_RPMSG_QCOM_GLINK_NATIVE) += qcom_glink_native.o
obj-$(CONFIG_RPMSG_QCOM_GLINK_SMEM) += qcom_glink_smem.o
obj-$(CONFIG_RPMSG_QCOM_SMD) += qcom_smd.o
obj-$(CONFIG_RPMSG_VIRTIO) += virtio_rpmsg_bus.o