From patchwork Thu Apr 24 16:00:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 4052481 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 C598EBFF02 for ; Thu, 24 Apr 2014 16:04:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06BCA202F2 for ; Thu, 24 Apr 2014 16:04:15 +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 0539920353 for ; Thu, 24 Apr 2014 16:04:14 +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 1WdM6f-00004r-E3; Thu, 24 Apr 2014 16:02:37 +0000 Received: from mail-wg0-f44.google.com ([74.125.82.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WdM5u-00083J-BW for linux-arm-kernel@lists.infradead.org; Thu, 24 Apr 2014 16:01:51 +0000 Received: by mail-wg0-f44.google.com with SMTP id m15so2467738wgh.27 for ; Thu, 24 Apr 2014 09:01:28 -0700 (PDT) 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=npiDOs4arEVqg+K8l92r1GlI23+JfB/LsMOcs7KAYT0=; b=CF4v0/dnQStdPfZ850mixVy3jRABECug5FoTy4kR6nJSIUgKWFTP46Yzq9WLc4FQQb TkRUQ5IS8C2hAiKVUyNICaz3p6OLl91BJFmkJrJep0eUM4riRnaE85V8ctDp2qrjK7cJ zDXAdJdRjtbsLQLpQSH5/fLY51BQdNGZmSJk5TXTNLOZhTQB6m6H9G7LKmqyjbB1E/jd 7GTLBPBlS9EJgdpmXMUwWyc8rals3pIVfPPQLdCVOcfquoTv5hdaP9gK12UUoDuAkaLn fEnJljgarIQHBYtTzGqqCwaB/pPaHVUqGxmdt2Pynyi8UA3cAcdmODTNFOp7vEL/+rgf WjzA== X-Gm-Message-State: ALoCoQn/JHQ57A2fC0lPZ9iVf5k0bYhm9+lehKyKmYF8NESzEIGQ29Q3Jr1W1CZ98qnaQE8atvL+ X-Received: by 10.194.185.148 with SMTP id fc20mr2433212wjc.27.1398355288228; Thu, 24 Apr 2014 09:01:28 -0700 (PDT) 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 v6sm11458711wif.0.2014.04.24.09.01.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2014 09:01:27 -0700 (PDT) From: Daniel Thompson To: Russell King Subject: [RESEND PATCH v5 5/5] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) Date: Thu, 24 Apr 2014 17:00:46 +0100 Message-Id: <1398355246-29571-6-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398355246-29571-1-git-send-email-daniel.thompson@linaro.org> References: <1396886056-18132-1-git-send-email-daniel.thompson@linaro.org> <1398355246-29571-1-git-send-email-daniel.thompson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140424_090150_539442_2451729E X-CRM114-Status: GOOD ( 12.55 ) X-Spam-Score: -0.7 (/) Cc: Daniel Thompson , linaro-kernel@lists.linaro.org, Arnd Bergmann , patches@linaro.org, spear-devel@list.st.com, linux-kernel@vger.kernel.org, Paul Bolle , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-2.5 required=5.0 tests=BAYES_00,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 targetted 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 overriden. Problem is fixed by removing the automatic enabling of this option. Signed-off-by: Daniel Thompson --- 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 2612dd0..ca9a01c 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -996,12 +996,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