From patchwork Tue Oct 2 16:36:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11959 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4C00F23EFF for ; Tue, 2 Oct 2012 16:37:28 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id CEDEAA18710 for ; Tue, 2 Oct 2012 16:37:27 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so14609064iej.11 for ; Tue, 02 Oct 2012 09:37:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=HWXW7FY3tlJ+lwgNtYSR+SFusqMXK9b4sj4DceinQLU=; b=Jmi1VR9wgD8ITgVhwKiNmlmmLRJgRlB5kPvNOXRMImjPw4wwQjFE/hmoVT4N6s9ddO g5J2/W3YuWcsuEGubD4XnoyeApn6NMzik10CvDD0XJalugE82b8Gxm7qeLHHtQwCa/yQ ugBgOaRBmcnkULc4Ntf5kb8epn9Z+3dodtlAfsyUIfosTI5frtJv7A1T/xXGcGXSDjCn 7X8rxSaZxXlBYhY7Co/QmlA/ItXoMoQqMMg5MFTwbpw3TrHhSJd7DR356HjRwrJC2gC1 jAQIsFokHPhOUmDDjuipx5w2ok5d+P17fqjlBowIiZDtdinlzxt2PxrEg8NZNAeUMKaY c6jA== Received: by 10.50.194.136 with SMTP id hw8mr9474502igc.28.1349195847610; Tue, 02 Oct 2012 09:37:27 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp92080igc; Tue, 2 Oct 2012 09:37:26 -0700 (PDT) Received: by 10.216.135.147 with SMTP id u19mr9840337wei.12.1349195842376; Tue, 02 Oct 2012 09:37:22 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.186]) by mx.google.com with ESMTPS id g8si24151682wie.19.2012.10.02.09.37.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:37:21 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M2Wmb-1Tbiuo1GVB-00ry3u; Tue, 02 Oct 2012 18:37:20 +0200 From: Arnd Bergmann To: linux-arm-kernel@infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Linus Walleij , Stephen Warren Subject: [PATCH 17/17] ARM: soc: dependency warnings for errata Date: Tue, 2 Oct 2012 18:36:56 +0200 Message-Id: <1349195816-2225-18-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349195816-2225-1-git-send-email-arnd@arndb.de> References: <1349195816-2225-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:wa98cI5tNEzVAw6h/8haDQyv2pqjcV9usSo89Sx9yY1 VAbhTVa/+aw2DL2IRfqATigGXkJzTR+LQx8UbBCpN+RTrZ0qbB PB9UGx37HIXPgBPHpiiYe6Y55fKYTdwne2qxzTpU3Utgt+99Qy 417LXhX+hEr6qLk/wScPtqe8AkEXE656h2fH9TQ3QuSiicD3qQ qneWBpH8MFVuqXLSH0hWt4fpHG7liZbi/7pAd2o3L8cUBg/Yj/ hZEI27iwo3yAp7LBrGIyOfsZ974rM0P49CZaIYHHtxcNenSyZg v2bYxuxs0j8KEG8x1D4cIrlbfl8WrGdkGJo3n8FxQnlQjHjMki oDXG9EE+Plgsqh8x+krChJlWFMDBC7Ch7UoRpSkXCbkcyam6Jr dn76CZgvhmqmQ== X-Gm-Message-State: ALoCoQmNhtX/oRw1dl5HYFsj1N3T8gj8fFhJyABjeqjw+T8iieY3J6Y2di6DEUlhIBozwD9+NwRZ The PL310_ERRATA_753970 and ARM_ERRATA_764369 symbols only make sense when the base features for them are enabled, so select them conditionally in Kconfig to avoid warnings like: warning: (UX500_SOC_COMMON) selects PL310_ERRATA_753970 which has unmet direct dependencies (CACHE_PL310) warning: (ARCH_TEGRA_2x_SOC && ARCH_TEGRA_3x_SOC && UX500_SOC_COMMON) selects ARM_ERRATA_764369 which has unmet direct dependencies (CPU_V7 && SMP) Signed-off-by: Arnd Bergmann Cc: Linus Walleij Cc: Stephen Warren --- arch/arm/mach-tegra/Kconfig | 4 ++-- arch/arm/mach-ux500/Kconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 9077aaa..b5f62ab 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -16,7 +16,7 @@ config ARCH_TEGRA_2x_SOC select ARM_ERRATA_742230 select ARM_ERRATA_751472 select ARM_ERRATA_754327 - select ARM_ERRATA_764369 + select ARM_ERRATA_764369 if SMP select PL310_ERRATA_727915 if CACHE_L2X0 select PL310_ERRATA_769419 if CACHE_L2X0 select CPU_FREQ_TABLE if CPU_FREQ @@ -38,7 +38,7 @@ config ARCH_TEGRA_3x_SOC select ARM_ERRATA_743622 select ARM_ERRATA_751472 select ARM_ERRATA_754322 - select ARM_ERRATA_764369 + select ARM_ERRATA_764369 if SMP select PL310_ERRATA_769419 if CACHE_L2X0 select CPU_FREQ_TABLE if CPU_FREQ help diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 53d3d46..18755f1 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -5,9 +5,9 @@ config UX500_SOC_COMMON default y select ARM_GIC select HAS_MTU - select PL310_ERRATA_753970 + select PL310_ERRATA_753970 if CACHE_PL310 select ARM_ERRATA_754322 - select ARM_ERRATA_764369 + select ARM_ERRATA_764369 if SMP select CACHE_L2X0 select PINCTRL select PINCTRL_NOMADIK