From patchwork Thu Apr 3 20:30:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 27701 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f200.google.com (mail-yk0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5F12020490 for ; Thu, 3 Apr 2014 20:30:38 +0000 (UTC) Received: by mail-yk0-f200.google.com with SMTP id q9sf3985906ykb.7 for ; Thu, 03 Apr 2014 13:30:38 -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=1neD86AeHQZj3j3YDn3yU2AC7EAQlLGXoEBPoQBhEms=; b=mQkAWuTgZejDnlWSrROJ7iRCO0p3VOW0MYbyLkL1n6vSkFnutH4j6CaNEE3LA+Fb/e o8zcMnD3C/iWoeq6Fyc/pGq/2KO1EFRwCNQYGc1xo5Bf4W8TBfYGOUP+pqD69hzHvUo1 zXVcE62FjzM8u/z2LWh2JbyLeSO3GsNZ68mJaoKXtdka6lmb37Zx/EROkbK9YieCkg6i 5Ni/Lp2Nz9zwd1nhacESpRc9AYGIxLwYFlgixdQEj/3L7ujmYI0gZ0Xt50XLez9VQ3WK klPHtsi1CouRQjJyoHE5eE2b8KTmpzOAc87Bkx7DQe+DwCOgNl42B6+cM+bZBXToJZua oEcA== X-Gm-Message-State: ALoCoQnJf8nouqxFvoQ4ljS1lAXZsP5rHryQ/+hCEZoGg6oG9/ParpJUWLhU3ivMj/P+CtIhEq+Z X-Received: by 10.236.83.112 with SMTP id p76mr4337065yhe.51.1396557038459; Thu, 03 Apr 2014 13:30:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.21 with SMTP id t21ls799854qge.1.gmail; Thu, 03 Apr 2014 13:30:38 -0700 (PDT) X-Received: by 10.221.74.200 with SMTP id yx8mr4471733vcb.3.1396557038356; Thu, 03 Apr 2014 13:30:38 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id fn10si1405166vdc.135.2014.04.03.13.30.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 13:30:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 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.178; Received: by mail-vc0-f178.google.com with SMTP id im17so2405513vcb.37 for ; Thu, 03 Apr 2014 13:30:38 -0700 (PDT) X-Received: by 10.220.10.2 with SMTP id n2mr4521534vcn.26.1396557038195; Thu, 03 Apr 2014 13:30:38 -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 v8csp58964vcv; Thu, 3 Apr 2014 13:30:36 -0700 (PDT) X-Received: by 10.66.142.170 with SMTP id rx10mr9897668pab.117.1396557035949; Thu, 03 Apr 2014 13:30:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6si3566741paa.380.2014.04.03.13.30.34; Thu, 03 Apr 2014 13:30:34 -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 S1753605AbaDCUa2 (ORCPT + 27 others); Thu, 3 Apr 2014 16:30:28 -0400 Received: from mail-ig0-f181.google.com ([209.85.213.181]:33639 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753537AbaDCUa0 (ORCPT ); Thu, 3 Apr 2014 16:30:26 -0400 Received: by mail-ig0-f181.google.com with SMTP id h18so66166igc.2 for ; Thu, 03 Apr 2014 13:30:25 -0700 (PDT) X-Received: by 10.50.154.66 with SMTP id vm2mr10753018igb.4.1396557025729; Thu, 03 Apr 2014 13:30:25 -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 s9sm273259igw.16.2014.04.03.13.30.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 13:30:24 -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] mach-bcm: clean up config and build targets Date: Thu, 3 Apr 2014 15:30:52 -0500 Message-Id: <1396557052-24029-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.178 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). Also use Kbuild's $(-y) variable mechanism to build a single object file containing everything used for the bcm281xx board in arch/arm/mach-bcm. 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 Signed-off-by: Alex Elder --- arch/arm/mach-bcm/Kconfig | 28 ++++++++++++++++++++++++---- arch/arm/mach-bcm/Makefile | 16 ++++++++++++---- 2 files changed, 36 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..08e63c1 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -10,10 +10,18 @@ # 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) += bcm281xx.o +bcm281xx-y := board_bcm281xx.o +bcm281xx-y += 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