From patchwork Thu May 2 16:47:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16605 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f69.google.com (mail-qe0-f69.google.com [209.85.128.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BFF0B238EC for ; Thu, 2 May 2013 16:48:11 +0000 (UTC) Received: by mail-qe0-f69.google.com with SMTP id a11sf1375829qen.8 for ; Thu, 02 May 2013 09:48:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:mime-version :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=533yU4LLCfd+rAJScmqvC7zxf9rpD/mBrazfJQ/9ftE=; b=jAWHcxUysl8pSjGO4TGAAvPrVqavCabnFpGUWrPtY7q3erW5R3nTafkx7Avus4f456 V8pgkSQk/fJuteobHDoVW5DyLlYamVOPkN/1hERLyNUX9YYkUxtie5Wq3SkUULdzKRSb i2um20TeF0YgJT8Inz3BVpFCCTzqnrs2F1SioRF7DlduzAP2KngxGGq8rZzBwfTlOkGv tZS8EVsHrc67d/e5HgKHPFVo70LXlqaNwRjwcpdvKPZw5zeHZSBKHS1DFjyLV5yYiaIT nSeRRaavcfqORxXhHhnsqPFhvtogNDvsy2zxGY+dGpWiZHG6xbFlzCpQG17FLxYpxauI CQEQ== X-Received: by 10.236.14.233 with SMTP id d69mr5693895yhd.51.1367513283791; Thu, 02 May 2013 09:48:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.62.138 with SMTP id y10ls1014645qer.74.gmail; Thu, 02 May 2013 09:48:03 -0700 (PDT) X-Received: by 10.52.99.162 with SMTP id er2mr2093571vdb.67.1367513283617; Thu, 02 May 2013 09:48:03 -0700 (PDT) Received: from mail-ve0-x229.google.com (mail-ve0-x229.google.com [2607:f8b0:400c:c01::229]) by mx.google.com with ESMTPS id b4si3253725vdw.96.2013.05.02.09.48.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 09:48:03 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::229; Received: by mail-ve0-f169.google.com with SMTP id jz10so704850veb.14 for ; Thu, 02 May 2013 09:48:03 -0700 (PDT) X-Received: by 10.221.0.199 with SMTP id nn7mr2489718vcb.14.1367513283492; Thu, 02 May 2013 09:48: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.58.127.98 with SMTP id nf2csp210972veb; Thu, 2 May 2013 09:48:02 -0700 (PDT) X-Received: by 10.15.41.2 with SMTP id r2mr21488829eev.23.1367513281653; Thu, 02 May 2013 09:48:01 -0700 (PDT) Received: from eu1sys200aog111.obsmtp.com (eu1sys200aog111.obsmtp.com [207.126.144.131]) by mx.google.com with SMTP id g1si8899196eeo.84.2013.05.02.09.47.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 09:48:01 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.131 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.131; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob111.postini.com ([207.126.147.11]) with SMTP ID DSNKUYKYqHACJ1R/sSU8oqb6tXGMIf+Kx9nH@postini.com; Thu, 02 May 2013 16:48:01 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4D7AA19F; Thu, 2 May 2013 16:47:36 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 05C5A5923; Thu, 2 May 2013 16:47:28 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 07AE124C07C; Thu, 2 May 2013 18:47:27 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 2 May 2013 18:47:35 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH] ARM: u300: move debugmacro to debug includes Date: Thu, 2 May 2013 18:47:32 +0200 Message-ID: <1367513252-23384-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQki8tmO23Una1vXwvKqz8N3YXTLx5R3teHq1JAf2OR/s683/L18o9Thhd5JshY/JEetvxCj X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::229 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: , From: Linus Walleij This moves the U300 debug macro to the debug headers to make way for multiplatform support. Signed-off-by: Linus Walleij --- arch/arm/Kconfig.debug | 8 ++++++++ .../include/mach/debug-macro.S => include/debug/u300.S} | 0 2 files changed, 8 insertions(+) rename arch/arm/{mach-u300/include/mach/debug-macro.S => include/debug/u300.S} (100%) diff --git a/arch/arm/mach-u300/include/mach/debug-macro.S b/arch/arm/include/debug/u300.S similarity index 100% rename from arch/arm/mach-u300/include/mach/debug-macro.S rename to arch/arm/include/debug/u300.S diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9b31f43..ea74618 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -414,6 +414,13 @@ choice Say Y here if you want the debug print routines to direct their output to the uart1 port on SiRFmarco devices. + config DEBUG_U300_UART + bool "Kernel low-level debugging messages via U300 UART0" + depends on ARCH_U300 + help + Say Y here if you want the debug print routines to direct + their output to the uart port on U300 devices. + config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU @@ -595,6 +602,7 @@ config DEBUG_LL_INCLUDE default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART default "debug/socfpga.S" if DEBUG_SOCFPGA_UART default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 + default "debug/u300.S" if DEBUG_U300_UART default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 default "debug/vt8500.S" if DEBUG_VT8500_UART0