From patchwork Tue Aug 7 22:45:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Sealey X-Patchwork-Id: 1289961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C49B13FCC5 for ; Tue, 7 Aug 2012 22:48:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SysXB-0000dG-IU; Tue, 07 Aug 2012 22:45:53 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SysWr-0000Xq-F9 for linux-arm-kernel@lists.infradead.org; Tue, 07 Aug 2012 22:45:34 +0000 Received: by mail-ob0-f177.google.com with SMTP id ta17so222251obb.36 for ; Tue, 07 Aug 2012 15:45:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=jcXk45ZdVZDUmalqX+JUJaczrEIrzrLfVXHiIYKzgng=; b=Xl683zQG5gZ/uaZtGDFHF5JEeYMAhkG8OKsE2PjGfL82vHy6kdolxgsbLdQEh6QGVm EgR121/ylj2mMXbl6M1bhVBLE3RF8LpeO9lGPX9hdA4FvTOSoWhWMS8SoJK8fh2yzr6n gCCeKYoP7Ciu7WK4Y9fPWmTrA5zpa2gdyZdRhS9+sZ1eKtgykc5jLdo6TEcHLgDPWHDz K3l5gx9LGFyxWkIw8gI9z7nP6ixujwcxou1wLlpStx7fwmO4JYspfmKmQYPkr4UZKGue 9BDOMa8BrBGaW6w00fXcnAKIVdgsCnS54l1oRGoeTmeprdvk92WwwlMQyaUJjx88VLYg Vh/w== Received: by 10.182.2.233 with SMTP id 9mr27025405obx.11.1344379533146; Tue, 07 Aug 2012 15:45:33 -0700 (PDT) Received: from shinji.genesi-usa.com ([199.193.222.22]) by mx.google.com with ESMTPS id qd7sm21070387obc.5.2012.08.07.15.45.32 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 15:45:32 -0700 (PDT) From: Matt Sealey To: Linux ARM Kernel Mailing List Subject: [PATCH 2/2] ARM: only build ssi-fiq.S et al if CONFIG_SND_IMX_SOC_PCM_FIQ is selected Date: Tue, 7 Aug 2012 17:45:14 -0500 Message-Id: <1344379514-30076-3-git-send-email-matt@genesi-usa.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344379514-30076-1-git-send-email-matt@genesi-usa.com> References: <1344379514-30076-1-git-send-email-matt@genesi-usa.com> X-Gm-Message-State: ALoCoQkPuTSWIdwrqOvApCNbXtVcWVRGBHwShGPSyVJAhsyv6ap2JXFMbdcdzFfpW7DAeBIQhHJI X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Dave Martin , Steev Klimaszewski , Mark Brown , Linux Kernel Mailing List , Anton Vorontsov , Sascha Hauer , Matt Sealey , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Further to the previous patch, a custom configuration may be used based on the imx_v6_v7_defconfig which removes the board depending on the audio driver pulling this support code. However, since it is built dependent on CONFIG_SND_IMX_SOC it is enabled in the build for all i.MX processors which enable any audio drivers. Correct this by only building the SSI FIQ support code when the more specific CONFIG_SND_IMX_SOC_PCM_FIQ is enabled. Since it's enabled in the imx_v6_v7_defconfig anyway by the Eukrea board, nothing changes using the defconfig, so this is just a convenience for people reconfiguring their kernels more sparsely than the default. Signed-off-by: Matt Sealey Acked-by: Shawn Guo --- arch/arm/plat-mxc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index 6ac7200..89927f5 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_MXC_USE_EPIT) += epit.o obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -ifdef CONFIG_SND_IMX_SOC +ifdef CONFIG_SND_IMX_SOC_PCM_FIQ obj-y += ssi-fiq.o obj-y += ssi-fiq-ksym.o endif