From patchwork Fri May 31 09:18:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17336 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B03FC25CAB for ; Fri, 31 May 2013 09:21:07 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id hr14sf673298wib.1 for ; Fri, 31 May 2013 02:21:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :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=V1GlyD69ek3WIH+vjSkw9PzntTQfBxUCtAuHTpaFAWw=; b=k3Oouk6E9tPj1yZ3rt1XEeOka/7n8o3HuAyifHfKjeEmu47D/y+g2/v/fFXiTXTiJe 3FkspRQJdJbnjhbN8Jtf6xpWnJ+deM9g7T8oSHFc0ngOJlSfEFkmTWw2lM4sBnIZMLv+ XrCPriJqkLJSZp1Rid7D1gsGkKSiE6qkL1bqSPN1WJd2+Mh3ko/4YX8GtznzrZ6HO0gv CoHRB7eSv27G0izQ1mLQB5EyQlExZGG9HzcRUsQN+0LFY/XE4N5SYsL1SI4bcmPmFD0v tKLWcs27+Chtf1a3rnCtUVg5bx5QdU36ynnesAJ+J2O9ynpMirwDhqCO7GEUU0p2nwH9 WQgA== X-Received: by 10.180.91.40 with SMTP id cb8mr1134948wib.2.1369992066902; Fri, 31 May 2013 02:21:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.78.138 with SMTP id b10ls167803wix.26.gmail; Fri, 31 May 2013 02:21:06 -0700 (PDT) X-Received: by 10.194.158.102 with SMTP id wt6mr8521739wjb.5.1369992066823; Fri, 31 May 2013 02:21:06 -0700 (PDT) Received: from mail-ve0-x22d.google.com (mail-ve0-x22d.google.com [2607:f8b0:400c:c01::22d]) by mx.google.com with ESMTPS id ez7si10652642wjd.198.2013.05.31.02.21.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:06 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22d 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::22d; Received: by mail-ve0-f173.google.com with SMTP id jw11so963381veb.32 for ; Fri, 31 May 2013 02:21:05 -0700 (PDT) X-Received: by 10.58.172.67 with SMTP id ba3mr9147921vec.58.1369992065762; Fri, 31 May 2013 02:21:05 -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.229.199 with SMTP id jj7csp42420vcb; Fri, 31 May 2013 02:21:04 -0700 (PDT) X-Received: by 10.15.22.14 with SMTP id e14mr12552734eeu.124.1369992062638; Fri, 31 May 2013 02:21:02 -0700 (PDT) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id g8si30019158eep.190.2013.05.31.02.20.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:02 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.139; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKUahraO3WcSwErxV/iwxYOyauBNFsyfRF@postini.com; Fri, 31 May 2013 09:21:02 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 9B97628C; Fri, 31 May 2013 09:20:39 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1D5614A39; Fri, 31 May 2013 09:20:22 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id F3784A8065; Fri, 31 May 2013 11:20:34 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:20:38 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 22/39] ARM: u300: move debugmacro to debug includes Date: Fri, 31 May 2013 11:18:57 +0200 Message-ID: <1369991954-17406-23-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnkOIDE7qCKMr3muud5Do4GKnyiFTLF9rp4DmqxEUmKGq/7g6feEE7YXtQpWHT0U7fr84Nk X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22d 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 1d41908..2708ed9 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -443,6 +443,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_UX500_UART depends on ARCH_U8500 bool "Use Ux500 UART for low-level debug" @@ -643,6 +650,7 @@ config DEBUG_LL_INCLUDE default "debug/socfpga.S" if DEBUG_SOCFPGA_UART default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/tegra.S" if DEBUG_TEGRA_UART + default "debug/u300.S" if DEBUG_U300_UART default "debug/ux500.S" if DEBUG_UX500_UART default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1