From patchwork Wed Jun 18 08:48:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 32113 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 26740206A0 for ; Wed, 18 Jun 2014 08:50:23 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kq14sf2025761pab.0 for ; Wed, 18 Jun 2014 01:50:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=euXJQBaZsJV5rh0X0N3JXubaQUsJF0yj03wwrWdY+pE=; b=ZEMXDUg/NmIL+2eKd+upUmQuPwt5alwZiPYuKaNMQpcFL/9cJD+hFoB+hL+n7nyYmq yo64fg5KrSy/rPMNT0ls4yQwsUGd0Mes1dwfqRBL0vcVh/XS42SX4GFEcdYQeXekoyV1 73gnMduHkRIzJnn6kSrXTKIxDKj54P11WzOx+w/TsXWz7+lU9zABxKK3euemQg1LxuOY 5R6AZRkVnYbkmnr1fgCLonRal4wh1ySCObDMt9WxFfNIQx4mn6zPFcgZ35i68Z7LhPJw cw8Jggpc/wxTCuOY5JEQloZrtk073NWopb/ITV+64zFPsDll7dH5HvxKuLIHogOoe9Vx 7OQw== X-Gm-Message-State: ALoCoQlsgZvG9B0M+y0TQ1t/PpjHkYi2WlaqgmjF107K5OgGYeptgbvaty7O5AKmy0D4NkGYa+vd X-Received: by 10.66.232.229 with SMTP id tr5mr273472pac.16.1403081422310; Wed, 18 Jun 2014 01:50:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.203 with SMTP id v69ls6634qgd.6.gmail; Wed, 18 Jun 2014 01:50:22 -0700 (PDT) X-Received: by 10.58.85.3 with SMTP id d3mr354602vez.34.1403081422150; Wed, 18 Jun 2014 01:50:22 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id xa4si574621vcb.12.2014.06.18.01.50.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Jun 2014 01:50:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so487892veb.6 for ; Wed, 18 Jun 2014 01:50:22 -0700 (PDT) X-Received: by 10.52.88.44 with SMTP id bd12mr56402vdb.86.1403081422061; Wed, 18 Jun 2014 01:50:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp267505vcb; Wed, 18 Jun 2014 01:50:21 -0700 (PDT) X-Received: by 10.224.87.130 with SMTP id w2mr747410qal.5.1403081420440; Wed, 18 Jun 2014 01:50:20 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id e9si1382898qac.94.2014.06.18.01.50.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2014 01:50:20 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1WxBYF-0007EV-QN; Wed, 18 Jun 2014 08:49:03 +0000 Received: from mail-we0-f170.google.com ([74.125.82.170]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WxBYD-00079I-DU for linux-arm-kernel@lists.infradead.org; Wed, 18 Jun 2014 08:49:01 +0000 Received: by mail-we0-f170.google.com with SMTP id w61so495509wes.15 for ; Wed, 18 Jun 2014 01:48:38 -0700 (PDT) X-Received: by 10.194.76.212 with SMTP id m20mr45251529wjw.30.1403081318844; Wed, 18 Jun 2014 01:48:38 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-99-228-46.as13285.net. [2.99.228.46]) by mx.google.com with ESMTPSA id gd5sm1784772wjb.40.2014.06.18.01.48.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jun 2014 01:48:37 -0700 (PDT) From: Srinivas Kandagatla To: arnd@arndb.de, olof@lixom.net Subject: [PATCH v1] ARM: debug: fix broken DEBUG_LL_INCLUDE for multi platform Date: Wed, 18 Jun 2014 09:48:33 +0100 Message-Id: <1403081313-28234-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402394236-14778-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1402394236-14778-1-git-send-email-srinivas.kandagatla@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140618_014901_616671_C0D2F8BA X-CRM114-Status: GOOD ( 11.39 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.170 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.170 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Srinivas Kandagatla , linux@arm.linux.org.uk, 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srinivas.kandagatla@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On multi_v7_defconfig using def_bool in Kconfig can override the selection made as part of DEBUG_LL. This is because def_bool will set the config to true if the expression evaluates to true, which is what was happening in multi_v7_defconfig. ARCH_SPEAR13XX selects DEBUG_UART_PL01X overriding any previous DEBUG_LL selections and resulting in DEBUG_LL_INCLUDE to always point to debug/pl01x.S. Choice menu already provides options for selecting pl01x and 8250 via DEBUG_LL_UART_PL01X and DEBUG_LL_UART_8250 options. so I don't see point of having dependencies or def_bool options for PL01X and 8250. Other than getting them selected automatically and overriding DEBUG_LL selections. Without this patch its impossible to get earlyprintk working with multi_v7_defconfig Signed-off-by: Srinivas Kandagatla --- Am resending this patch as I missed arm-soc people in the loop. arch/arm/Kconfig.debug | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 8f90595..4ee4103 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1019,22 +1019,11 @@ config DEBUG_LL_INCLUDE default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S" -# Compatibility options for PL01x config DEBUG_UART_PL01X - def_bool ARCH_EP93XX || \ - ARCH_INTEGRATOR || \ - ARCH_SPEAR3XX || \ - ARCH_SPEAR6XX || \ - ARCH_SPEAR13XX || \ - ARCH_VERSATILE - -# Compatibility options for 8250 + bool + config DEBUG_UART_8250 - def_bool ARCH_DOVE || ARCH_EBSA110 || \ - (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ - ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \ - ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \ - ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC + bool config DEBUG_UART_PHYS hex "Physical base address of debug UART"