Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1525482 > unrolled thread

[PATCH] remoteproc: wcnss-pil: add QCOM_SMD dependency

Back to article view | Back to linux.kernel

Contents

  [PATCH] remoteproc: wcnss-pil: add QCOM_SMD dependency Arnd Bergmann <arnd@arndb.de> - 2016-11-18 17:20 +0100
    Re: [PATCH] remoteproc: wcnss-pil: add QCOM_SMD dependency Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-11-18 18:10 +0100

#1525482 — [PATCH] remoteproc: wcnss-pil: add QCOM_SMD dependency

When qcom_smd is a loadable module and adsp-pil is built-in,
we get a link error:

drivers/remoteproc/qcom_wcnss_pil.o: In function `wcnss_smd_remove':
qcom_wcnss_iris.c:(.text.wcnss_smd_remove+0x10): undefined reference to `qcom_smd_unregister_edge'
drivers/remoteproc/qcom_wcnss_pil.o: In function `wcnss_smd_probe':
qcom_wcnss_iris.c:(.text.wcnss_smd_probe+0x12): undefined reference to `qcom_smd_register_edge'

This adds a Kconfig dependency to avoid this. We can still allow
build-testing with SMD disabled.

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 5a0019ce7555..677b3fede83d 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -106,6 +106,7 @@ config QCOM_Q6V5_PIL
 config QCOM_WCNSS_PIL
 	tristate "Qualcomm WCNSS Peripheral Image Loader"
 	depends on OF && ARCH_QCOM
+	depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD = n)
 	depends on QCOM_SMEM
 	depends on REMOTEPROC
 	select QCOM_MDT_LOADER
-- 
2.9.0

[toc] | [next] | [standalone]

#1525544

On Fri 18 Nov 08:15 PST 2016, Arnd Bergmann wrote:

> When qcom_smd is a loadable module and adsp-pil is built-in,
> we get a link error:
> 
> drivers/remoteproc/qcom_wcnss_pil.o: In function `wcnss_smd_remove':
> qcom_wcnss_iris.c:(.text.wcnss_smd_remove+0x10): undefined reference to `qcom_smd_unregister_edge'
> drivers/remoteproc/qcom_wcnss_pil.o: In function `wcnss_smd_probe':
> qcom_wcnss_iris.c:(.text.wcnss_smd_probe+0x12): undefined reference to `qcom_smd_register_edge'
> 
> This adds a Kconfig dependency to avoid this. We can still allow
> build-testing with SMD disabled.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied

Thanks,
Bjorn

> ---
>  drivers/remoteproc/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
> index 5a0019ce7555..677b3fede83d 100644
> --- a/drivers/remoteproc/Kconfig
> +++ b/drivers/remoteproc/Kconfig
> @@ -106,6 +106,7 @@ config QCOM_Q6V5_PIL
>  config QCOM_WCNSS_PIL
>  	tristate "Qualcomm WCNSS Peripheral Image Loader"
>  	depends on OF && ARCH_QCOM
> +	depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD = n)
>  	depends on QCOM_SMEM
>  	depends on REMOTEPROC
>  	select QCOM_MDT_LOADER
> -- 
> 2.9.0
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web