From patchwork Mon Dec 22 16:57:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 5528561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 06268BEEA8 for ; Mon, 22 Dec 2014 17:03:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 26E04201B4 for ; Mon, 22 Dec 2014 17:03:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4925A200D4 for ; Mon, 22 Dec 2014 17:03:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y36M4-0003LG-FZ; Mon, 22 Dec 2014 17:01:12 +0000 Received: from mail-wi0-f175.google.com ([209.85.212.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y36Jy-0000bD-6y for linux-arm-kernel@lists.infradead.org; Mon, 22 Dec 2014 16:59:03 +0000 Received: by mail-wi0-f175.google.com with SMTP id l15so8584835wiw.14 for ; Mon, 22 Dec 2014 08:58:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CHtV3nD/s6KuWRppn9iGrI8CJXx/jBbM6VTZQ/gw7Ug=; b=ayV9dTKNWXbxcb3PmbKNfN/O9xCvwgUEbt6/UjtXgEMYIcKZCE9QqvH4D467jO3a/h oJ0h1norIR3uKjajmZFkW5Jw2rDs/wIuEY17TWw/jrxW0AfG9R9hHrMgHINXJacYyMFT a2dOrud8WhqmYkPRfIKJoZCrEtwD5BQf2HQ2VDY5SomRZPhOtrtg3K6f0kT+fpz0bgFE iLtnnoq3gPbL323e8uP2x41kA5seJza2Vdx9xj0HGya4uVitn2RSAvbRFI7R6YNwDFvI 3cDm38qs4iDJNMH34QevBblI/Pnl+TPgwvid/nMf43dWfYM+oFXevnvV0whZ/lrW9pUw o+wg== X-Gm-Message-State: ALoCoQm4CB8LwXfwu0B2Tg3f9tIy4Lvdy5GXpsd+Xn4jKAOvw/oFMzwjiLzib37pDie7lkXlJe+N X-Received: by 10.194.84.179 with SMTP id a19mr9239897wjz.96.1419267519900; Mon, 22 Dec 2014 08:58:39 -0800 (PST) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id j2sm24372608wjs.28.2014.12.22.08.58.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Dec 2014 08:58:38 -0800 (PST) From: Daniel Thompson To: Russell King , Arnd Bergmann Subject: [PATCH 3.19-rc1 v14 8/8] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) Date: Mon, 22 Dec 2014 16:57:25 +0000 Message-Id: <1419267445-8330-9-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1419267445-8330-1-git-send-email-daniel.thompson@linaro.org> References: <1419267445-8330-1-git-send-email-daniel.thompson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141222_085902_468049_A273E04E X-CRM114-Status: GOOD ( 11.74 ) X-Spam-Score: -0.7 (/) Cc: Paul Bolle , linaro-kernel@lists.linaro.org, patches@linaro.org, spear-devel@list.st.com, Daniel Thompson , linux-kernel@vger.kernel.org, Srinivas Kandagatla , John Stultz , Sumit Semwal , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When building a multi_v7_defconfig kernel it is not possible to configure DEBUG_LL to use any serial device except a ARM Primecell PL01X, or more accurately and worse, it is possible to configure a different serial device but KConfig does not honour this request. In fact this also overrides the user selection for some of the single platform kernels, for example I don't think DEBUG_LL can be targeted at ICE or semihosted supervisor for ARCH_VERSATILE. This happens because DEBUG_UART_PL01X is automatically enabled by some architectures and this means user decisions made regarding the DEBUG_LL backend will be overridden. Problem is fixed by removing the automatic enabling of this option. Signed-off-by: Daniel Thompson Acked-by: Arnd Bergmann --- arch/arm/Kconfig.debug | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index e250505b9ae1..a324ecdfeb21 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1263,12 +1263,7 @@ config DEBUG_LL_INCLUDE # Compatibility options for PL01x config DEBUG_UART_PL01X - def_bool ARCH_EP93XX || \ - ARCH_INTEGRATOR || \ - ARCH_SPEAR3XX || \ - ARCH_SPEAR6XX || \ - ARCH_SPEAR13XX || \ - ARCH_VERSATILE + bool # Compatibility options for 8250 config DEBUG_UART_8250