From patchwork Tue Apr 15 12:37:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 28410 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F250A2036A for ; Tue, 15 Apr 2014 12:37:53 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf50925213oag.9 for ; Tue, 15 Apr 2014 05:37:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=KeEHT3jhF9SW5zJrCbClyTjsGTbL+mz4j8AZUmECe6k=; b=ZTy5DYpS5DQv157yx8MzO3jubcN/qIFNfGCw1W+sbj2uw/4wi8tkhTBTnQ2Z51ma3E Y0FcURVLKsFgId1sI2eN88o+DBfAu7nVcWwV29zWy0alTv3JP22Gbtyh7Gi0aRO1TOwx OgNGV8DrJOS+JB5Ehjwyrp3nMZlXoVK6t+eOAbEV7NqFSl03AmGw5BELnLvZRl6LxQnP 9ru7DsvgJCN6PUXupJFaN64fkx5AIuOr/ri9kcD0TSLrKP6VfqIYv+pUkUx64mBUAdEd UJnFiXUa6knnnfnkam7xorZWMRF7sAMHGumK50nGQdBr2HlDXCjbAMQuueHVVYzrFOKu HBeA== X-Gm-Message-State: ALoCoQn7Xc9vsdg3dNHZsmFRIbxtRFmQmME4A9zDg2WwxI1gyuQbrzxsblmw5/axunVzX8mpfhNL X-Received: by 10.182.213.5 with SMTP id no5mr629689obc.15.1397565473306; Tue, 15 Apr 2014 05:37:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.241 with SMTP id n104ls100483qgd.36.gmail; Tue, 15 Apr 2014 05:37:53 -0700 (PDT) X-Received: by 10.52.108.228 with SMTP id hn4mr101913vdb.43.1397565473107; Tue, 15 Apr 2014 05:37:53 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id i7si3371644vei.139.2014.04.15.05.37.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Apr 2014 05:37:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id ib6so9351393vcb.27 for ; Tue, 15 Apr 2014 05:37:53 -0700 (PDT) X-Received: by 10.220.81.194 with SMTP id y2mr1157352vck.29.1397565473015; Tue, 15 Apr 2014 05:37:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp227942vcb; Tue, 15 Apr 2014 05:37:52 -0700 (PDT) X-Received: by 10.66.249.233 with SMTP id yx9mr1667929pac.3.1397565472166; Tue, 15 Apr 2014 05:37:52 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6si10732884paa.462.2014.04.15.05.37.51; Tue, 15 Apr 2014 05:37:51 -0700 (PDT) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753716AbaDOMhm (ORCPT + 26 others); Tue, 15 Apr 2014 08:37:42 -0400 Received: from mail-ie0-f170.google.com ([209.85.223.170]:45290 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750790AbaDOMhl (ORCPT ); Tue, 15 Apr 2014 08:37:41 -0400 Received: by mail-ie0-f170.google.com with SMTP id rd18so9294418iec.1 for ; Tue, 15 Apr 2014 05:37:40 -0700 (PDT) X-Received: by 10.43.180.133 with SMTP id pe5mr1284614icc.71.1397565460806; Tue, 15 Apr 2014 05:37:40 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id h7sm37537064igy.2.2014.04.15.05.37.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Apr 2014 05:37:39 -0700 (PDT) From: Alex Elder To: bcm@fixthebug.org, mporter@linaro.org Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] mach-bcm: clean up config and build targets Date: Tue, 15 Apr 2014 07:37:19 -0500 Message-Id: <1397565439-29735-1-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently CONFIG_ARCH_BCM_MOBILE is used to select all (both) Broadcom mobile SoC families. Instead, use that only as a config menu switch, and define specific symbols like ARCH_BCM_281XX to select a particular SoC family. If ARCH_BCM_MOBILE is selected, all of the SoCs will be selected by default, but this way each can be disabled individually as well. Note that BCM281xx and BCM21664 both require the SMC and L2 cache control code, so that code will be built based on ARCH_BCM_MOBILE. Signed-off-by: Alex Elder --- v4: Rebased on to of v3.15-rc1. Small tweak in Makefile. v3: SMC and L2 cache code is needed by both SoC families. v2: No longer uses Kbuild's $(-y) variable mechanism. The patch is available here: http://git.linaro.org/landing-teams/working/broadcom/kernel.git Branch review/mach-bcm-cleanup-v4 arch/arm/mach-bcm/Kconfig | 28 ++++++++++++++++++++++++---- arch/arm/mach-bcm/Makefile | 15 ++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 49c914c..5f5740f 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -10,7 +10,7 @@ if ARCH_BCM menu "Broadcom SoC Selection" config ARCH_BCM_MOBILE - bool "Broadcom Mobile SoC" if ARCH_MULTI_V7 + bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7 depends on MMU select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_754322 @@ -23,9 +23,29 @@ config ARCH_BCM_MOBILE select PINCTRL help 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. + +if ARCH_BCM_MOBILE + +menu "Broadcom Mobile SoC Selection" + +config ARCH_BCM_281XX + bool "Broadcom BCM281XX SoC family" + default y + help + Enable support for the the BCM281XX family, which includes + BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155 + variants. + +config ARCH_BCM_21664 + bool "Broadcom BCM21664 SoC family" + default y + help + Enable support for the the BCM21664 family, which includes + BCM21663 and BCM21664 variants. + +endmenu + +endif config ARCH_BCM2835 bool "Broadcom BCM2835 family" if ARCH_MULTI_V6 diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index a326b28..7fb9b04 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -10,10 +10,19 @@ # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -obj-$(CONFIG_ARCH_BCM_MOBILE) := board_bcm281xx.o board_bcm21664.o \ - bcm_kona_smc.o bcm_kona_smc_asm.o kona.o -obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o +# BCM281XX +obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o +# BCM21664 +obj-$(CONFIG_ARCH_BCM_21664) += board_bcm21664.o + +# BCM281XX and BCM21664 L2 cache control +obj-$(CONFIG_ARCH_BCM_MOBILE) += bcm_kona_smc.o bcm_kona_smc_asm.o kona.o plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec) + +# BCM2835 +obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o + +# BCM5301X obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o