Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / remoteproc / Kconfig

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index d4d377c40ec96585126f474238040d47c9e79c2e..55730b839268773182960f65ab79ee18a86e45fb 100644 (file)
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -63,4 +63,25 @@ config DA8XX_REMOTEPROC
          It's safe to say n here if you're not interested in multimedia
          offloading.
 
+config ZYNQ_REMOTEPROC
+       tristate "Support ZYNQ remoteproc"
+       depends on ARCH_ZYNQ && SMP
+       select REMOTEPROC
+       select RPMSG
+       select HOTPLUG_CPU
+       default m
+       help
+         Say y here to support Xilinx ZynQ remote processors (the second
+         ARM CORTEX-A9 cpu) via the remote processor framework.
+
+config MB_REMOTEPROC
+       tristate "Support Microblaze remoteproc"
+       depends on ARCH_ZYNQ
+       select REMOTEPROC
+       select RPMSG
+       default m
+       help
+         Say y here to support Xilinx Microblaze remote processors
+         on the Xilinx Zynq.
+
 endmenu