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: 27805 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4497F20490 for ; Fri, 4 Apr 2014 11:18:04 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf10464762oag.1 for ; Fri, 04 Apr 2014 04:18:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=XR3wVZAckuQ1559CRAw86BvROvbnqTjaH7dJ4x1yE+A=; b=Sv76l0NVcrzMeucrGd3HALl63vE8UFptd181clY81Uf22VteQidvvpT+yVJOLdF84L HY/0/VoulKPo9Y0K2WT8Ow8AgH2cbf1br/NAGKCrKmW2oemlUn2EyeNdkYh62sDHAawL lDSrBWyVlB8QkTRsHiGqSWARD+bjWKgEu41X/wem3xeu9Qz6FfuEFmIuAWNXk2keHiFT sVLKyG+wG0wGujkY6LxB6UDPJDhm8HZHaiJvPfuwVA0fVUii9Hhy13+/GiEDZPmwY9k4 Ju7IdoR0FOnxoGA9RiC4/lXI1gSiCUu7RlRpaHm35FyH3trllgU7TsVw2D9RPLwqOApv RAcg== X-Gm-Message-State: ALoCoQmQDjycKgi9DE92AHrnP5EmYGRbkzdmKwuTD7Om9fYZvKK9UDhlJpqkod1ETScV7cWUNmzP X-Received: by 10.50.254.1 with SMTP id ae1mr1632856igd.6.1396610283438; Fri, 04 Apr 2014 04:18:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.194 with SMTP id d60ls984201qge.86.gmail; Fri, 04 Apr 2014 04:18:03 -0700 (PDT) X-Received: by 10.220.11.208 with SMTP id u16mr7745920vcu.19.1396610283361; Fri, 04 Apr 2014 04:18:03 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id p8si723145vef.122.2014.04.04.04.18.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 04:18:03 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so2947294vcb.8 for ; Fri, 04 Apr 2014 04:18:03 -0700 (PDT) X-Received: by 10.52.51.197 with SMTP id m5mr10798925vdo.9.1396610283300; Fri, 04 Apr 2014 04:18:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.12.8 with SMTP id v8csp105189vcv; Fri, 4 Apr 2014 04:18:02 -0700 (PDT) X-Received: by 10.180.19.130 with SMTP id f2mr3752406wie.6.1396610282131; Fri, 04 Apr 2014 04:18:02 -0700 (PDT) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id a20si3207972wjx.207.2014.04.04.04.18.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 04:18:02 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of daniel.thompson@linaro.org) client-ip=74.125.82.52; Received: by mail-wg0-f52.google.com with SMTP id k14so3256910wgh.23 for ; Fri, 04 Apr 2014 04:18:01 -0700 (PDT) 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 Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, Daniel Thompson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, spear-devel@list.st.com 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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