From patchwork Fri Apr 4 00:45:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 27720 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5FB1720490 for ; Fri, 4 Apr 2014 00:45:38 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf8755285obc.4 for ; Thu, 03 Apr 2014 17:45:37 -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=lSs31A2VfIDrxx5T4J+CtGFfe5QHSKQowwlwN7+dYsg=; b=KGOkIoLj1o0SQSP49Dlbe4sh6k9FQkJ3wmymTNIgILhxUSGzGNcJZOT3m7XNJhDshv 574uqUX2FwCJ4A0M4anM6I+415AlvzeJSFYu6i62WIdyI7P2cHqVZIBevptMPRUYc0Xl /gqoE5zx2sRUEBJPJt/Y2dPpWqgMBfA7SXhjr/69HwrVW+jSvOf9y06/qk75EQB1DiCx zx2ufMNwMuXQkJRJmGxm7t2Nhd9+V8mmvdYiRd4LAwyrCLGrejJDaDu+fzTBMZIHhuUY psybdTh843md4f/HCDex+dMSGxtxSfRvSxQWBFy9LHzwcJPKAtE4uYSNgYMkq+g6tQam 1K0A== X-Gm-Message-State: ALoCoQmDfv7CezDmSCLv/FEfzYaFu3oO3OqQ1lUfBN8Z94P7/liYIzB4NaqX3byBhoXWtWtMryG0 X-Received: by 10.42.115.129 with SMTP id k1mr5672093icq.25.1396572337470; Thu, 03 Apr 2014 17:45:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.72 with SMTP id s66ls871118qgs.85.gmail; Thu, 03 Apr 2014 17:45:37 -0700 (PDT) X-Received: by 10.221.28.202 with SMTP id rv10mr5602090vcb.10.1396572337379; Thu, 03 Apr 2014 17:45:37 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id x6si1512872vcl.12.2014.04.03.17.45.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 17:45:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so893750veb.36 for ; Thu, 03 Apr 2014 17:45:37 -0700 (PDT) X-Received: by 10.58.1.97 with SMTP id 1mr2320619vel.23.1396572337247; Thu, 03 Apr 2014 17:45:37 -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.12.8 with SMTP id v8csp72077vcv; Thu, 3 Apr 2014 17:45:36 -0700 (PDT) X-Received: by 10.68.235.6 with SMTP id ui6mr11074104pbc.45.1396572336079; Thu, 03 Apr 2014 17:45:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sh5si3804212pbc.450.2014.04.03.17.45.35; Thu, 03 Apr 2014 17:45:35 -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 S1752003AbaDDAp1 (ORCPT + 27 others); Thu, 3 Apr 2014 20:45:27 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:59005 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbaDDApZ (ORCPT ); Thu, 3 Apr 2014 20:45:25 -0400 Received: by mail-ig0-f171.google.com with SMTP id c1so299808igq.16 for ; Thu, 03 Apr 2014 17:45:24 -0700 (PDT) X-Received: by 10.51.15.225 with SMTP id fr1mr29983igd.5.1396572324538; Thu, 03 Apr 2014 17:45:24 -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 gd5sm1840713igd.5.2014.04.03.17.45.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 17:45:23 -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 v3] mach-bcm: clean up config and build targets Date: Thu, 3 Apr 2014 19:45:50 -0500 Message-Id: <1396572350-10728-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.128.177 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 --- v3: SMC and L2 cache code is needed by both SoC families. v2: No longer uses Kbuild's $(-y) variable mechanism. Note: This patch is based on the current arm-soc/for-next branch: e98cd72 arm-soc: document samsung merges The patch is available here: http://git.linaro.org/landing-teams/working/broadcom/kernel.git Branch review/mach-bcm-cleanup-v3 arch/arm/mach-bcm/Kconfig | 28 ++++++++++++++++++++++++---- arch/arm/mach-bcm/Makefile | 17 +++++++++++++---- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 21f97f7..183fdef 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 diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index a326b28..b2279e3 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 plus_sec := $(call as-instr,.arch_extension sec,+sec) + +# 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 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