From patchwork Mon Mar 20 09:35:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9633555 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46553601E9 for ; Mon, 20 Mar 2017 09:36:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39ECA27F54 for ; Mon, 20 Mar 2017 09:36:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CA2F28403; Mon, 20 Mar 2017 09:36:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B19B727F54 for ; Mon, 20 Mar 2017 09:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=DyG4imtA3n+O53pt0QGcHAAlIeCyRoP/pGG7D1MJ47A=; b=kdj gKKsI18bPLL3l/CLWAJjZEEZbVw//6ZgTS0spTFwtx8EriQ6eqzNbpIuxaRLd+LFndelV45RriwGx rkdXoilHE9sSYOA2xBLa9XhlADIK5A3t+UsqUpa496d35P7zR5I7VCaeWTFIjVM2aNZOinrAHnIWT ezMee8wmNwqX/Sp5X0F0AXTbI3n8lQTxihJE/A9N12eMSlfQDBWKDSK8oQZ/3lUpuusyyMpj1K89n qdntoIcUTqx67rzsXKDs6BoTxCd5X90G7o/6XR8RqRBWkgHmNlEntHbBGDX30PP1f3aL3vt18ZRda 59zOezjhHOxOXXnGpGkfDOf8UcoAwEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cptkE-0005Vt-D8; Mon, 20 Mar 2017 09:36:54 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cptjq-00058u-UZ; Mon, 20 Mar 2017 09:36:33 +0000 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M8WB9-1c2ciw24Jv-00w9rF; Mon, 20 Mar 2017 10:35:53 +0100 From: Arnd Bergmann To: Lee Jones , Eric Anholt , Stefan Wahren , Greg Kroah-Hartman Subject: [PATCH] staging: vc04_services: make BCM_VIDEOCORE tristate Date: Mon, 20 Mar 2017 10:35:28 +0100 Message-Id: <20170320093544.1213296-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Zi8sYAWkYb3EhzxBbjBMA/Kchrf/N3LmgqaFWB0mrpUzgpnPCFF njc5a5PzG2NlRDPlR+4FWrHExFFtPtfOd8NnseUPg7m7ZPkvaOZN0CLs4xVOGiboLgcgTpV NbetaghNpfbLcjgIpGws343bl+xJhTCCTY05rpsLvwOzYE12+FcnLBOeGvLBVysFTBu6+bu M0+FB00DDh9gTpyxV6dxw== X-UI-Out-Filterresults: notjunk:1; V01:K0:PSzCzCS/RYo=:JoXG+DnqLrB1elMyIJ/thz qWYyi05aXUwhs1viDVJCiSKL/wRXSgsj9ipvcnOTL1F8QUiDezU4NgFVXiheS6d/UcKv0ph+M dPyM1INWePcIRZ6V17q/5FrNrPccR0QVL0RK/zfcrRXYIxiestauxj/Q1ptjhOdOd/xOw+4py CgGOLTMwoDUitsDnyPLwmxwa/XSyzi7V7ef6HlwZyuVFJ5ippIY84Wpqa78Hu8wlxWuzZuL3J HQDfv1/jxhoqwsg4NcCmBp6LKzLOyEh8gV/XALqzlTlN5g+sSqlbpdXOzcbqBKeoKYwkrSTQB 85xJWFAlBEk+hyNv+oLJFZLMdVXphmETcX8aULyYFn9b/1dnYjC9OElbU4eHhFY+LKvIqZymr r8X60PcpdhyTsv3lbnpHd0l9XzG7P8F4iStdxry1BRZLQcUz902oe6JHw4+FQKl2PQO0+AbpA aiFV5D0tqF/POxqN2IiJKrPnTpL0bHhr27Df2JOgeyuL5GlShDG0OgNUQ7HG9t0ATe+lE6Il2 t5K7hotfv/1RZPMoNCUrs/oFvDmUMqcneCfNOJShUl6FceP1qIysvPxu/J7hAARaZAeVw4+hA d5EQVIXk7it2isdOjqt39yXZeH4laWzsu8ACPeAxEUqID+dwUH4vPs953n1ayTHOtWIZhHQ8v VlhN0/7cw+ILfUlDmlpQ2YX/ABcislndFGrpjAi1JoTa3cILeUcQkymx2cQ7cXScM86Q= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170320_023631_316947_0CC1939A X-CRM114-Status: UNSURE ( 8.27 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, Daniel Stone , Arnd Bergmann , linux-kernel@vger.kernel.org, Michael Zoran , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , linux-rpi-kernel@lists.infradead.org, popcornmix , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Adding the 'bool' symbol brought back a randconfig build bug that I had fixed before: drivers/staging/built-in.o: In function `vchiq_probe': (.text+0x1da30): undefined reference to `rpi_firmware_get' drivers/staging/built-in.o: In function `vchiq_platform_init': (.text+0x27494): undefined reference to `rpi_firmware_property' The problem is that when RASPBERRYPI_FIRMWARE is a loadable module, but BCM2835_VCHIQ can again be built-in. Making BCM_VIDEOCORE itself tristate will make Kconfig honor the dependency correctly. Fixes: 6bbfe4a76158 ("staging: vc04_services: Create new BCM_VIDEOCORE setting for VideoCore services.") Signed-off-by: Arnd Bergmann --- drivers/staging/vc04_services/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index f905df2275cf..9e2763663ab8 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -1,5 +1,5 @@ menuconfig BCM_VIDEOCORE - bool "Broadcom VideoCore support" + tristate "Broadcom VideoCore support" depends on HAS_DMA depends on OF depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)