From patchwork Fri Jul 26 20:23:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Daudt X-Patchwork-Id: 2834319 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B8DD9F4D4 for ; Fri, 26 Jul 2013 20:28:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 372B7201E3 for ; Fri, 26 Jul 2013 20:28:19 +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 D35C3201E0 for ; Fri, 26 Jul 2013 20:28:17 +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 1V2obw-0000vw-Jt; Fri, 26 Jul 2013 20:27:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2oba-0006rr-6W; Fri, 26 Jul 2013 20:27:14 +0000 Received: from mms3.broadcom.com ([216.31.210.19]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2obM-0006ou-28 for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2013 20:27:01 +0000 Received: from [10.9.208.57] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Fri, 26 Jul 2013 13:16:40 -0700 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Fri, 26 Jul 2013 13:26:25 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Fri, 26 Jul 2013 13:26:25 -0700 Received: from [10.0.2.15] (dhcp-rmna-vpn-138.ric.broadcom.com [10.136.253.138]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id DA47EF2D74; Fri, 26 Jul 2013 13:26:23 -0700 (PDT) Message-ID: <51F2DAA4.2090903@broadcom.com> Date: Fri, 26 Jul 2013 13:23:00 -0700 From: "Christian Daudt" User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: "Russell King - ARM Linux" Subject: Re: [PATCH v2 1/5] ARM: Broadcom: Unconditionally build arch/arm/mach-bcm References: <20130726145639.116237136@gmail.com> <20130726151223.045835540@gmail.com> <20130726152918.GL29916@titan.lakedaemon.net> <51F29BFE.8000202@broadcom.com> <20130726171153.GN29916@titan.lakedaemon.net> <51F2AF2D.1000300@broadcom.com> <20130726184702.GW24642@n2100.arm.linux.org.uk> <51F2C94F.6020405@broadcom.com> <20130726193908.GX24642@n2100.arm.linux.org.uk> In-Reply-To: <20130726193908.GX24642@n2100.arm.linux.org.uk> X-WSS-ID: 7DEC06AD2L852567224-02-01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130726_162700_363750_3C16B7AF X-CRM114-Status: GOOD ( 18.86 ) X-Spam-Score: -5.7 (-----) Cc: Jason Cooper , Arnd Bergmann , Hauke Mehrtens , Domenico Andreoli , Olof Johansson , linux-arm-kernel@lists.infradead.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=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 13-07-26 12:39 PM, Russell King - ARM Linux wrote: > On Fri, Jul 26, 2013 at 12:09:03PM -0700, Christian Daudt wrote: >> On 13-07-26 11:47 AM, Russell King - ARM Linux wrote: >>> On Fri, Jul 26, 2013 at 10:17:33AM -0700, Christian Daudt wrote: >>>> Because ARCH_BCM is meant to be used for a number of SoC families. We've >>>> started upstreaming one (the BCM281XX) but have 2 more internally that >>>> we're working towards upstreaming. And in the future our plan is to keep >>>> the Broadcom Mobile SoCs all building under this single ARCH_BCM >>>> configuration as multiplatform code building a single zImage for them. >>> 1. We're moving to a single zImage for everything. Not just Broadcom. >>> There's no need for Broadcom stuff to be treated any differently. >>> Participate in the single zImage project and you will get that benefit >>> without these games. >> I don't follow what is the game being played. > I don't really mind what you do, but when you start talking about having > any ARM build always descend into mach-bcm, then something is very wrong > with how you're going about it - you don't see anyone else needing that > in the tree, not even OMAP. > > I don't really care if your intention is to decend into mach-bcm and then > do nothing - that's not the point. The point is we shouldn't even > decend into mach-bcm if there's nothing to be built there. > Ok, how about creating a ARCH_BROADCOM to select descending into the mach-bcm dir, and renaming ARCH_BCM to ARCH_BCMMOBILE, along the lines of the attachment ? Thanks, csd diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c0ac0f5..cdb6662 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -145,7 +145,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 -machine-$(CONFIG_ARCH_BCM) += bcm +machine-$(CONFIG_ARCH_BROADCOM) += bcm machine-$(CONFIG_ARCH_BCM2835) += bcm2835 machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index f112895..0367f94 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -1,4 +1,11 @@ -config ARCH_BCM +config ARCH_BROADCOM + bool "Broadcom Multiplatform SOCs" + +if ARCH_BROADCOM + +menu "Broadcom SoC Family" + +config ARCH_BCMMOBILE bool "Broadcom SoC" if ARCH_MULTI_V7 depends on MMU select ARCH_REQUIRE_GPIOLIB @@ -13,7 +20,11 @@ config ARCH_BCM select SPARSE_IRQ select TICK_ONESHOT help - This enables support for system based on Broadcom SoCs. + This enables support for systems based on Broadcom mobile SoCs. It currently supports the 'BCM281XX' family, which includes BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155 variants. + +endmenu + +endif diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index 6adb6aec..08f9ebe 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -10,6 +10,6 @@ # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -obj-$(CONFIG_ARCH_BCM) := board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o +obj-$(CONFIG_ARCH_BCMMOBILE) := board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)