From patchwork Wed Nov 16 15:39:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101503 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp254509obn; Wed, 16 Nov 2016 07:43:43 -0800 (PST) X-Received: by 10.99.44.84 with SMTP id s81mr9572117pgs.153.1479311023191; Wed, 16 Nov 2016 07:43:43 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z62si32344320pgz.214.2016.11.16.07.43.42; Wed, 16 Nov 2016 07:43:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934236AbcKPPnk (ORCPT + 26 others); Wed, 16 Nov 2016 10:43:40 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:61855 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933567AbcKPPni (ORCPT ); Wed, 16 Nov 2016 10:43:38 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0M0z5L-1cvPio42ON-00v9lO; Wed, 16 Nov 2016 16:42:53 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Stephen Warren , Lee Jones , Eric Anholt , popcornmix , Stefan Wahren , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: vc04_services: clarify firmware dependency Date: Wed, 16 Nov 2016 16:39:06 +0100 Message-Id: <20161116154139.3703209-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161116154139.3703209-1-arnd@arndb.de> References: <20161116154139.3703209-1-arnd@arndb.de> X-Provags-ID: V03:K0:XOQMfwvNqh5fgpeHOhdQ4GLGFW/OO7aFURN6dkb5P8POYPTy/Lo ldUkr0sKP0CJj2J/IeUEwxRgu7yOV5A83SsHRFv+RcccYj1Dz01v1uOGx9knD8jd/VBeBQd RV+XiNzNrP+q4JjXL7eldeNxDf9Oietk07Bz2CT3Y0+9EDH9ezWcEan3rYVqdnXsJKTwG28 6ieHwEKZsXCwm62gFtUIQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:+pUkDeH/gdE=:8Go3Nl6D4GpJOobID9uGkR UhwEStk/12gaiwHKCx3AR77S78etwwO3Vfc/FOB7Bangq1a5hTkmoAeC4UeW0kp7aPrS27h+8 1M6/kKIsDx7OLI2jx4gKV7Sz7VqrJbrQvQKosY/8Q+uLc+YoXNr03psxxuYy8i17thMaMzf7C PbCQfLyAFa/o5szAjdluDPqoqCQtu6b0XPMPtF7oadg3oXnNFvx6KlVSkkwjnMxb4RADcakYO oW+oYbjXMiL0bQbC30abHiJhBaJeFcHb8S//tzgYVquwNtv9Tkm8BXfs/mX9Of3Er2E+s8+BE kT/zzL5HViMKh0YLDlJ/i/180S/hS6/iaVQVw51LmgaMLIfsPC4QXZ74lB168Q3mFVaU2QvWT Eo2N6T1GCq4LLDiodx1XnoKTVZACHX3plCMkIApzqwOjkDc4/LzbNVdaBfilxO0eKKDvb5xQU bYd9nlaoK0rsUDqHkFQC8G6U36AgP3aa+kX96mWeuspp3fSyFAvXPhMOZtWZPDCYRk4xNOTDc O/+ZI0TcS80ErPxHOL7YrqYrASYwI8MjcCokPz9hkeZw42b9sMRGebVXiVZZY2YMdgDVY7+k7 lrX8VKeTfC+oJ03faBDWwjRbgQEoR0NdLUWj+AvPuRpb09Iml/0En50i6u1/fiIXPPdrresnp qWC6gckGiBVK1H2LjGduyJ2BqAOrJxMeQdzctX7caVnlKHvyndCs3bYn+3BRK86ebwtw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The raspberrypi-firmware driver may be built as a loadable module, which causes a link-time failure if the vc04_services driver is built-in during compile-testing: drivers/staging/vc04_services/vchiq.o: In function `vchiq_probe': vchiq_connected.c:(.text.vchiq_probe+0x2c): undefined reference to `rpi_firmware_get' drivers/staging/vc04_services/vchiq.o: In function `vchiq_platform_init': vchiq_connected.c:(.text.vchiq_platform_init+0x1f0): undefined reference to `rpi_firmware_property' This extends the dependency list to ensure the firmware is either reachable, or completely disabled in case of compile-testing. Signed-off-by: Arnd Bergmann --- drivers/staging/vc04_services/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index 660dcedc2820..061ffd261086 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -1,6 +1,6 @@ config BCM2835_VCHIQ tristate "Videocore VCHIQ" - depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST + depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE) default y help Kernel to VideoCore communication interface for the