From patchwork Fri Apr 4 11:17:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 3937701 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 00CB5BFF02 for ; Fri, 4 Apr 2014 11:18:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F4D9203F4 for ; Fri, 4 Apr 2014 11:18:40 +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 30EF6203F3 for ; Fri, 4 Apr 2014 11:18:39 +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 1WW28o-0006an-J2; Fri, 04 Apr 2014 11:18:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WW28m-0006HW-21; Fri, 04 Apr 2014 11:18:32 +0000 Received: from mail-wg0-f51.google.com ([74.125.82.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WW28j-0006Gp-Lj for linux-arm-kernel@lists.infradead.org; Fri, 04 Apr 2014 11:18:30 +0000 Received: by mail-wg0-f51.google.com with SMTP id k14so3322329wgh.10 for ; Fri, 04 Apr 2014 04:18:01 -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; bh=XR3wVZAckuQ1559CRAw86BvROvbnqTjaH7dJ4x1yE+A=; b=PvfyOgyLWZgfTI8lj+4bPJIX2sKVZBMEcEkH7Gda8N+3qPTicPGrzbvA6/wG6V8kXd w4kJF/whnGxrBusQqR43FuJ7o71H3MdFE52918QQdC2h6RRvklK8hSg8YpbEPXm0jc0l s/jQ6hQqzbfdnFdOoKWek9WbgUPZK3TOvJh27buwJAjBU9nnkG+p0sXP1fG+0JPSG5DU SyjSO4xbMYjT50uFRndLwvuK+iPaYIJeoKz30x7iWbzIXxLgDeGN7BovNosBa0Zhw9++ MLlzC7Pc5uy40WfMQeZofQFBK7YGSrD5g8VqxEC/FygKuyFWTRu4RIONlE2ctnOi7sDH VrpA== X-Gm-Message-State: ALoCoQkOrstLTEcMjuLsDt6GjhbK1UmMznpUy9vTqM7Yx1RbbkJoBA0z06FPMPDInsFde8KMCWPo X-Received: by 10.180.89.211 with SMTP id bq19mr3628385wib.58.1396610281636; Fri, 04 Apr 2014 04:18:01 -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 bg6sm11992037wjb.24.2014.04.04.04.17.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Apr 2014 04:18:00 -0700 (PDT) From: Daniel Thompson To: Russell King Subject: [PATCH] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) Date: Fri, 4 Apr 2014 12:17:49 +0100 Message-Id: <1396610269-11580-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140404_071829_804494_E56CE7F1 X-CRM114-Status: GOOD ( 12.48 ) X-Spam-Score: -0.1 (/) Cc: Daniel Thompson , linaro-kernel@lists.linaro.org, patches@linaro.org, spear-devel@list.st.com, linux-kernel@vger.kernel.org, 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.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,SUSPICIOUS_RECIPS,UNPARSEABLE_RELAY autolearn=ham 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. The happens because the multi-platform mode may include ARCH_SPEAR13XX and this forcibly engages DEBUG_UART_PL01X to provide some kind of compatibility with single platform builds (SPEAr supports both single and multi-platform). This in turn causes DEBUG_LL_INCLUDE to wedge at debug/pl01x.S. Problem is fixed by only deploying the compatibility options for SPEAr when ARCH_MULTIPLATFORM is not set. Signed-off-by: Daniel Thompson --- arch/arm/Kconfig.debug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 0531da8..f10c784 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -991,9 +991,9 @@ config DEBUG_LL_INCLUDE config DEBUG_UART_PL01X def_bool ARCH_EP93XX || \ ARCH_INTEGRATOR || \ - ARCH_SPEAR3XX || \ - ARCH_SPEAR6XX || \ - ARCH_SPEAR13XX || \ + (ARCH_SPEAR3XX && !ARCH_MULTIPLATFORM) || \ + (ARCH_SPEAR6XX && !ARCH_MULTIPLATFORM) || \ + (ARCH_SPEAR13XX && !ARCH_MULTIPLATFORM) || \ ARCH_VERSATILE # Compatibility options for 8250