Skip to contentSkip to conversation

remoteproc: wcnss-pil: add QCOM_SMD dependency

PATCH Applied Arnd Bergmann 2 participants 2 messages Nov 18, 2016 Remote processor (remoteproc)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/remoteproc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/remoteproc/Kconfig +1 -0
index 5a0019ce7555..677b3fede83d 100644
@@ -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
Signature · 1 line
2.9.0
#1 lore raw
Quoted 8 lines · Arnd Bergmann

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'

Quoted 4 lines

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

Applied

Thanks,
Bjorn

Quoted 19 lines
---
 drivers/remoteproc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/remoteproc/Kconfig +1 -0
index 5a0019ce7555..677b3fede83d 100644
@@ -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
Signature · 1 line
2.9.0