diff mbox series

remoteproc: qcom: fix Q6V5_WCSS dependencies

Message ID 20180718111730.3531477-1-arnd@arndb.de
State Accepted
Commit 12c2b509c0cb981b34771097e4769abc7faebcee
Headers show
Series remoteproc: qcom: fix Q6V5_WCSS dependencies | expand

Commit Message

Arnd Bergmann July 18, 2018, 11:16 a.m. UTC
A new driver got added that depends on QCOM_SMD and fails to link
as built-in with CONFIG_QCOM_SMD=m:

drivers/remoteproc/qcom_common.o: In function `smd_subdev_stop':
qcom_common.c:(.text+0x674): undefined reference to `qcom_smd_unregister_edge'
drivers/remoteproc/qcom_common.o: In function `smd_subdev_start':
qcom_common.c:(.text+0x700): undefined reference to `qcom_smd_register_edge'

We've fixed the same thing several times before, so use the same
dependency here.

Fixes: 3a3d4163e0bf ("remoteproc: qcom: Introduce Hexagon V5 based WCSS driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/remoteproc/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.9.0

Comments

Sricharan Ramabadhran July 19, 2018, noon UTC | #1
Hi Arnd,

On 7/18/2018 4:46 PM, Arnd Bergmann wrote:
> A new driver got added that depends on QCOM_SMD and fails to link

> as built-in with CONFIG_QCOM_SMD=m:

> 

> drivers/remoteproc/qcom_common.o: In function `smd_subdev_stop':

> qcom_common.c:(.text+0x674): undefined reference to `qcom_smd_unregister_edge'

> drivers/remoteproc/qcom_common.o: In function `smd_subdev_start':

> qcom_common.c:(.text+0x700): undefined reference to `qcom_smd_register_edge'

> 

> We've fixed the same thing several times before, so use the same

> dependency here.

> 

> Fixes: 3a3d4163e0bf ("remoteproc: qcom: Introduce Hexagon V5 based WCSS driver")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Oops, missed it. Sorry.

Acked-by: Sricharan R <sricharan@codeaurora.org>


Regards,
 Sricharan

> ---

>  drivers/remoteproc/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig

> index 0dde3753c3a5..052d4dd347f9 100644

> --- a/drivers/remoteproc/Kconfig

> +++ b/drivers/remoteproc/Kconfig

> @@ -127,6 +127,7 @@ config QCOM_Q6V5_WCSS

>  	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"

>  	depends on OF && ARCH_QCOM

>  	depends on QCOM_SMEM

> +	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)

>  	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n

>  	depends on QCOM_SYSMON || QCOM_SYSMON=n

>  	select MFD_SYSCON

> 


-- 
"QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Bjorn Andersson July 31, 2018, 4:21 a.m. UTC | #2
On Wed 18 Jul 04:16 PDT 2018, Arnd Bergmann wrote:

> A new driver got added that depends on QCOM_SMD and fails to link

> as built-in with CONFIG_QCOM_SMD=m:

> 

> drivers/remoteproc/qcom_common.o: In function `smd_subdev_stop':

> qcom_common.c:(.text+0x674): undefined reference to `qcom_smd_unregister_edge'

> drivers/remoteproc/qcom_common.o: In function `smd_subdev_start':

> qcom_common.c:(.text+0x700): undefined reference to `qcom_smd_register_edge'

> 

> We've fixed the same thing several times before, so use the same

> dependency here.

> 


I have a change where I remove this inherited dependency, so I asked
Sricharan to only depend on the ones he actually uses - but I forgot
that I haven't pushed this.

Sorry about screwing this up again. Thanks for catching it!

Regards,
Bjorn

> Fixes: 3a3d4163e0bf ("remoteproc: qcom: Introduce Hexagon V5 based WCSS driver")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/remoteproc/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig

> index 0dde3753c3a5..052d4dd347f9 100644

> --- a/drivers/remoteproc/Kconfig

> +++ b/drivers/remoteproc/Kconfig

> @@ -127,6 +127,7 @@ config QCOM_Q6V5_WCSS

>  	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"

>  	depends on OF && ARCH_QCOM

>  	depends on QCOM_SMEM

> +	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)

>  	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n

>  	depends on QCOM_SYSMON || QCOM_SYSMON=n

>  	select MFD_SYSCON

> -- 

> 2.9.0

>
diff mbox series

Patch

diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 0dde3753c3a5..052d4dd347f9 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -127,6 +127,7 @@  config QCOM_Q6V5_WCSS
 	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"
 	depends on OF && ARCH_QCOM
 	depends on QCOM_SMEM
+	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
 	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
 	depends on QCOM_SYSMON || QCOM_SYSMON=n
 	select MFD_SYSCON