From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751582AbdIKTyi (ORCPT ); Mon, 11 Sep 2017 15:54:38 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:63478 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbdIKTyh (ORCPT ); Mon, 11 Sep 2017 15:54:37 -0400 From: Arnd Bergmann To: Ohad Ben-Cohen , Bjorn Andersson Cc: Arnd Bergmann , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] remoteproc: qcom: fix RPMSG_QCOM_GLINK_SMEM dependencies Date: Mon, 11 Sep 2017 21:54:17 +0200 Message-Id: <20170911195431.2913102-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:ZxdiSwXFLmD3hYvWN5doPB7r63kL6BxlVnyOGKy0uYXIejt/rIB 0+SK6lVlj381MNDEJvGAQ73RyZN72cqkJPclDzMhdDPcIqjeBCMQyvcVl4ZWBg8g0sPHAOh TnmhLZsAbl0o98s+tBJv8QgThXWtBWlLqP/IS4WESePFhoPvLTuYjouzsd65+OYfn9ix3Oe ZPKadv1VtQxbzwpaD+mcQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:XtW9od5yHv8=:9yE2foDygO8+ObrtecAhru LIQbpxpFJvH1qIX+Q6/1sVXM5z1tjxZS78FZeAtZC0Fq87iWyJVpLbEqssbffGR5qy6m8j6f8 1IdUaV6tbDLuaKhRea7OuOzQU/LujiLe7zpPO8tDtqITwG9U0f9RP7P5nTdL3Puz5I7ogmOXk uzQfN4xuUL62LuwQ90MF9AJywR2E+gABMRkXqshwf5p6V1SxiyurYArCV/EiVrLOWM8OOi+DN PQmdq2vGrvl2fvvG6xEs8KdQsqGX2ZLCZyPMseVC04XgEkHXzX+6+qlv4G+F0ltMYqr5ADodS RRhgoaQQQ07Z0r+spm7w3W6JCU7zot08JAbajdsQR/GE9q5R2eSQujcds/zfhWsr0KTZOC58w LzhGxSJ7xpAqjefn9DSPxMKw2gK5DVpqvg3tssmlGM6aPKj9ENqlJoBys+UdxaPDjPflDIG/t 6+52b+xANqbG64c7jXEh+8VXZ4xeyjnnQ7E4IILJrwfx995rDIr1dc57X1Iv8A3KsIi4hbOGm d9VJ9bQBvDvRsAxeMzdBsKTy1SNLiu5WQhDEjvAIsLj65PJYQH09oNAGZt3iNHSLeudenrfo7 FGRYBjVjDwksU4ZBbfZxdgcK9/V5300iwLgbwNSXlQgDOzky+zyywdxns2iOVZox/TFE0fcRQ 3YGKdEEyY/pIFeF5/siTQkALuzncsd/UKVa1eQY6PWKjk2pzxIE2BcdHSfBL8dm2u/TkadJqF Au/5SWMjrCLQccizC8IO24tMSLJLFDH9SBvd3g== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: eea07023e6d9 ("remoteproc: qcom: adsp: Allow defining GLINK edge") Signed-off-by: Arnd Bergmann --- drivers/remoteproc/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index df63e44526ac..bf04479456a0 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -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 -- 2.9.0