Merge remote-tracking branch 'rpmsg/for-next'

[deliverable/linux.git] / drivers / remoteproc / Kconfig

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 1a8bf76a925fa86e12c00e9c2a1e097a5dda333a..f396bfef5d42863b4f3b9609c9798b4df4ce6059 100644 (file)
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -17,7 +17,7 @@ config OMAP_REMOTEPROC
        select REMOTEPROC
        select MAILBOX
        select OMAP2PLUS_MBOX
-       select RPMSG
+       select RPMSG_VIRTIO
        help
          Say y here to support OMAP's remote processors (dual M3
          and DSP on OMAP4) via the remote processor framework.
@@ -59,7 +59,7 @@ config DA8XX_REMOTEPROC
        depends on ARCH_DAVINCI_DA8XX
        select CMA if MMU
        select REMOTEPROC
-       select RPMSG
+       select RPMSG_VIRTIO
        help
          Say y here to support DA8xx/OMAP-L13x remote processors via the
          remote processor framework.
@@ -91,6 +91,22 @@ config QCOM_Q6V5_PIL
          Say y here to support the Qualcomm Peripherial Image Loader for the
          Hexagon V5 based remote processors.
 
+config QCOM_WCNSS_IRIS
+       tristate
+       depends on OF && ARCH_QCOM
+
+config QCOM_WCNSS_PIL
+       tristate "Qualcomm WCNSS Peripheral Image Loader"
+       depends on OF && ARCH_QCOM
+       depends on QCOM_SMEM
+       select QCOM_MDT_LOADER
+       select QCOM_SCM
+       select QCOM_WCNSS_IRIS
+       select REMOTEPROC
+       help
+         Say y here to support the Peripheral Image Loader for the Qualcomm
+         Wireless Connectivity Subsystem.
+
 config ST_REMOTEPROC
        tristate "ST remoteproc support"
        depends on ARCH_STI