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: 4373841 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 2196F9F3B4 for ; Wed, 18 Jun 2014 08:51:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C5B320204 for ; Wed, 18 Jun 2014 08:51:25 +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 7A849201C7 for ; Wed, 18 Jun 2014 08:51:24 +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 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-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=CoCUP0EsqRoiJSIBRgRjISU155rSaCnSA8hKeBo0MdQ=; b=aod+8u6a5UiHrZXMp8AR7VboJEKO+mFw6Xep/7IPnS0sTVRyezGDvWSqqg1Ihg9gdy i3tu8EoGqdKkjJOGIUnM3bqSOEJE+TJ9Kv4F2N2A833jXJwuSfIRr5Jh60joLOTwGuKo V60h8eucUb6G1pgC31QQBHwaDoUnaOF6rIUM++vCnI0+4eJOCVRxi/UjiQw065uPTvOh PKnfTqkCkirYXNtCN+1CNY/C9JZDit/Jcf9A3bzkLYF9v8lpsJKkOm6dziSc4Jxa2BaU KUF2dgSCUY5+QDCLKWIRIehe15qH8OITAJnVGcFv9e3fTmNS5rgBcCNRU/9xEI2GWsNx Cfpw== X-Gm-Message-State: ALoCoQkXBt6h4QQB6vHHCLE7nVfM8xD3Kr9RL40ibk7DxfvDVqgIMypIr4jc3mUOTYxUcUQd8Qre 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 (/) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_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 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"