From patchwork Thu Apr 3 21:55:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 27719 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 3AC192036E for ; Thu, 3 Apr 2014 21:54:48 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf8509280oag.1 for ; Thu, 03 Apr 2014 14:54:47 -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=T09z2qrzel7rRadEgZY1AnH/DCw2Eb7DNgkNLrLxW5w=; b=Nt1B+/OuBuSDqmEmf5rQjb5zZy2DiuiU9mJH51u0Wl2ZYjJSgF8IYZ7IlFbmqtTnrW AO6Pf4Hkxeglurd6gC0dFMH4/tTcXw7oj8KJnR+jNb1kU7tWFWHCC8+WDlt/Kq0v/Voe rciZKzO1laT2l3hEZpLJSrEtKA47tVAaw0Xl4cX/TatoZOt9Z6GRHBsSsWmNWQ0a7Xyd UwnAPBmmd9ndDyKG+HC2ZKit1lfi67UoJD57R2v5p2VWjflP3wObErC+/Ci7FYYYOjQv X/1RpG3bU1nX7oa3NNJCEFh1F4WD12tKfni/ObHGNhq9VhjgfzbSr3zld86PNlNKEKK+ Ox7Q== X-Gm-Message-State: ALoCoQnRuQFHHZffskDaahBgqc7ykOorsQRGK3/mdJPpHOnqso5BmGWgP1v1TRtg29lmkCFDsg1Z X-Received: by 10.43.88.73 with SMTP id az9mr5027393icc.5.1396562087576; Thu, 03 Apr 2014 14:54:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.21 with SMTP id t21ls822822qge.1.gmail; Thu, 03 Apr 2014 14:54:47 -0700 (PDT) X-Received: by 10.58.238.35 with SMTP id vh3mr1645125vec.16.1396562087483; Thu, 03 Apr 2014 14:54:47 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id cb3si1432939vdc.113.2014.04.03.14.54.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 14:54:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 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.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so789522veb.14 for ; Thu, 03 Apr 2014 14:54:47 -0700 (PDT) X-Received: by 10.59.7.228 with SMTP id df4mr1661883ved.11.1396562087383; Thu, 03 Apr 2014 14:54:47 -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 v8csp63434vcv; Thu, 3 Apr 2014 14:54:46 -0700 (PDT) X-Received: by 10.66.102.66 with SMTP id fm2mr10351906pab.51.1396562085725; Thu, 03 Apr 2014 14:54:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id si6si148587pab.162.2014.04.03.14.54.45; Thu, 03 Apr 2014 14:54:45 -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 S1753902AbaDCVyi (ORCPT + 27 others); Thu, 3 Apr 2014 17:54:38 -0400 Received: from mail-ig0-f179.google.com ([209.85.213.179]:60725 "EHLO mail-ig0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753367AbaDCVyh (ORCPT ); Thu, 3 Apr 2014 17:54:37 -0400 Received: by mail-ig0-f179.google.com with SMTP id hl10so157216igb.6 for ; Thu, 03 Apr 2014 14:54:36 -0700 (PDT) X-Received: by 10.50.80.11 with SMTP id n11mr18482878igx.36.1396562076762; Thu, 03 Apr 2014 14:54:36 -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 vk7sm2189147igb.1.2014.04.03.14.54.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 14:54:35 -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 v2] mach-bcm: clean up config and build targets Date: Thu, 3 Apr 2014 16:55:04 -0500 Message-Id: <1396562104-2457-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.169 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 Broadcom mobile SoCs. Instead, use that only as a config menu switch, and define specific symbols like CONFIG_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. This allows more precision in controlling what gets built under mach-bcm. Another benefit to doing this is that it makes it obvious that the code that implements SMC calls to control L2 cache is only used for BCM281XX (for example). Signed-off-by: Alex Elder --- 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-v2 arch/arm/mach-bcm/Kconfig | 28 ++++++++++++++++++++++++---- arch/arm/mach-bcm/Makefile | 15 +++++++++++---- 2 files changed, 35 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..ac1f5cc 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -10,10 +10,17 @@ # 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 +obj-$(CONFIG_ARCH_BCM_281XX) += 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) + +# BCM21664 +obj-$(CONFIG_ARCH_BCM_21664) += board_bcm21664.o + +# BCM2835 +obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o + +# BCM5301X obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o