From patchwork Mon Apr 7 15:54:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 3946281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1EE279F369 for ; Mon, 7 Apr 2014 15:58:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5094320225 for ; Mon, 7 Apr 2014 15:58:29 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 18A2C20221 for ; Mon, 7 Apr 2014 15:58:28 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXBuN-0000R3-KH; Mon, 07 Apr 2014 15:56:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXBts-0002tk-W7; Mon, 07 Apr 2014 15:55:56 +0000 Received: from mail-wg0-f48.google.com ([74.125.82.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXBt8-0002mm-F3 for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2014 15:55:11 +0000 Received: by mail-wg0-f48.google.com with SMTP id l18so6979995wgh.31 for ; Mon, 07 Apr 2014 08:54:48 -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=iHnvHqrRoYBilBgFLmuFa6O8SSy7NeAhH1W2QjR2uxo=; b=YXRVGgRdKpx7zw/Zf84D09nkhj/Pa5vcA3bG+k3rUiwJ9rxkGdXrjfTGQFatTcBDd9 5gKe2ZmcCR0MDpTWm4ojc6m7QG/OnIBLuV/Me9RHvy9tG5ouknQKZRTHU4rL1MMr5tDS x15Wa7eOt4gjE9rWqdKK7OIGRt2oBpQP0yHyJeAcAkMXjTWbhdmzNLuv0ftPGPfxKcIS c4q9ZINU7g+eUVsd1CX6k20Ahr6SCUscEqUIjNDO26f/h0AQnvVGZQ4K1YuzLUHnLVTr pdWLLXd+3HofpG8EGcuk1r+nYHYXXICK4LD1Zu4BNqdqQMoIhuGdRuSjgZMWs06Dfz7L 7NMg== X-Gm-Message-State: ALoCoQnrZpUcPmcMNR8SpqpMeAZaJNGN7aIBUBVy1wSmcyLFaXFOmcGDZ9hUFfI9T+oArbnyYWAs X-Received: by 10.180.97.37 with SMTP id dx5mr25954187wib.53.1396886088912; Mon, 07 Apr 2014 08:54:48 -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 xs1sm27074979wjb.27.2014.04.07.08.54.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Apr 2014 08:54:48 -0700 (PDT) From: Daniel Thompson To: Russell King Subject: [PATCH v4 5/5] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) Date: Mon, 7 Apr 2014 16:54:16 +0100 Message-Id: <1396886056-18132-6-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1396886056-18132-1-git-send-email-daniel.thompson@linaro.org> References: <1396626102-13991-1-git-send-email-daniel.thompson@linaro.org> <1396886056-18132-1-git-send-email-daniel.thompson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140407_115510_651224_8E454404 X-CRM114-Status: GOOD ( 13.12 ) X-Spam-Score: -2.6 (--) 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=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 50fdc86..0a4ebf0 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1000,12 +1000,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