Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab759b97 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Bjorn Andersson
Browse files

remoteproc: qcom: fix RPMSG_QCOM_GLINK_SMEM dependencies 



When RPMSG_QCOM_GLINK_SMEM=m and one driver causes the qcom_common.c file
to be compiled as built-in, we get a link error:

drivers/remoteproc/qcom_common.o: In function `glink_subdev_remove':
qcom_common.c:(.text+0x130): undefined reference to `qcom_glink_smem_unregister'
qcom_common.c:(.text+0x130): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `qcom_glink_smem_unregister'
drivers/remoteproc/qcom_common.o: In function `glink_subdev_probe':
qcom_common.c:(.text+0x160): undefined reference to `qcom_glink_smem_register'
qcom_common.c:(.text+0x160): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `qcom_glink_smem_register'

Out of the three PIL driver instances, QCOM_ADSP_PIL already has a
Kconfig dependency to prevent this from happening, but the other two
do not. This adds the same dependency there.

Fixes: eea07023 ("remoteproc: qcom: adsp: Allow defining GLINK edge")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 68c2d645

drivers/remoteproc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ config QCOM_Q6V5_PIL 
	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

	select MFD_SYSCON

	select QCOM_RPROC_COMMON

	select QCOM_SCM
@@ -120,6 +121,7 @@ config QCOM_WCNSS_PIL 
	tristate "Qualcomm WCNSS Peripheral Image Loader"

	depends on OF && ARCH_QCOM

	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_SMEM

	select QCOM_MDT_LOADER

	select QCOM_RPROC_COMMON