From patchwork Wed Aug 14 20:04:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 2844768 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3DB61BF546 for ; Wed, 14 Aug 2013 20:05:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16F2F206D0 for ; Wed, 14 Aug 2013 20:05:17 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50FD02069E for ; Wed, 14 Aug 2013 20:05:12 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9hJd-0003Jt-RH; Wed, 14 Aug 2013 20:05:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9hJb-0004aV-K2; Wed, 14 Aug 2013 20:05:07 +0000 Received: from 8bytes.org ([2a01:238:4242:f000:64f:6c43:3523:e535] helo=mail.8bytes.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9hJY-0004Zh-BR for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2013 20:05:04 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.8bytes.org (Postfix) with SMTP id 5E17712AF2A for ; Wed, 14 Aug 2013 22:04:43 +0200 (CEST) Received: by mail.8bytes.org (Postfix, from userid 1000) id 7920E12AF1A; Wed, 14 Aug 2013 22:04:42 +0200 (CEST) Date: Wed, 14 Aug 2013 22:04:42 +0200 From: Joerg Roedel To: Russell King - ARM Linux Subject: Re: [PATCH] ARM: integrator: Make sure INTEGRATOR_AP depends on PCI Message-ID: <20130814200442.GA20372@8bytes.org> References: <1376509818-22163-1-git-send-email-joro@8bytes.org> <20130814195701.GY23006@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130814195701.GY23006@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Wed Aug 14 22:04:43 2013 X-DSPAM-Confidence: 0.9993 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 520be2db20861825020025 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130814_160504_671816_78BA0F20 X-CRM114-Status: GOOD ( 17.33 ) X-Spam-Score: -2.2 (--) Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Aug 14, 2013 at 08:57:01PM +0100, Russell King - ARM Linux wrote: > On Wed, Aug 14, 2013 at 09:50:18PM +0200, Joerg Roedel wrote: > > Add this dependency to the Kconfig file to fix the following > > build error when CONFIG_INTEGRATOR_AP is set but CONFIG_PCI > > is not: > > No, integrator does not require PCI, so this needs to be fixed by other > means, such as finding out how the breakage was introduced, and fixing > the real cause of this regression. You are right, just found out that this introduces a recursive dependency while compiling another config: arch/arm/Kconfig:1403:error: recursive dependency detected! arch/arm/Kconfig:1403: symbol PCI depends on MIGHT_HAVE_PCI arch/arm/Kconfig:108: symbol MIGHT_HAVE_PCI is selected by ARCH_INTEGRATOR_AP arch/arm/mach-integrator/Kconfig:5: symbol ARCH_INTEGRATOR_AP depends on PCI So when integrator does not depend on PCI this diff is more appropriate? Reviewed-by: Linus Walleij diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h index 755fd29..51738e0 100644 --- a/arch/arm/mach-integrator/pci_v3.h +++ b/arch/arm/mach-integrator/pci_v3.h @@ -1,2 +1,9 @@ -/* Simple oneliner include to the PCIv3 early init */ +/* Define PCIv3 early init */ +#ifdef CONFIG_PCI extern int pci_v3_early_init(void); +#else +static inline int pci_v3_early_init(void) +{ + return 0; +} +#endif