From patchwork Tue Sep 25 22:46:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 1506691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 9667640079 for ; Tue, 25 Sep 2012 22:49:17 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TGdus-0005Ib-HK; Tue, 25 Sep 2012 22:47:46 +0000 Received: from avon.wwwdotorg.org ([2001:470:1f0f:bd7::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TGduB-0005DZ-6T for linux-arm-kernel@lists.infradead.org; Tue, 25 Sep 2012 22:47:04 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 6FC7B644C; Tue, 25 Sep 2012 16:47:53 -0600 (MDT) Received: from localhost.localdomain (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 3800DE47A1; Tue, 25 Sep 2012 16:47:01 -0600 (MDT) From: Stephen Warren To: Arnd Bergmann , Olof Johansson , Russell King , Rob Herring Subject: [RFC PATCH 3/3] ARM: tegra: move debug macros to include/debug Date: Tue, 25 Sep 2012 16:46:52 -0600 Message-Id: <1348613212-21897-4-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1348613212-21897-1-git-send-email-swarren@wwwdotorg.org> References: <1348613212-21897-1-git-send-email-swarren@wwwdotorg.org> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-tegra@vger.kernel.org, Stephen Warren , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Stephen Warren Move Tegra's debug-macro.S and uncompress.h over to the common debug macro directory. Signed-off-by: Stephen Warren --- TODO: We need to find a better solution for access to . Perhaps the headers should just be moved into some generally accessible location, such as arch/arm/include or include/linux/... --- arch/arm/Kconfig.debug | 9 +++++++++ .../debug/tegra-uncompress.h} | 6 ++---- .../mach/debug-macro.S => include/debug/tegra.S} | 6 ++---- 3 files changed, 13 insertions(+), 8 deletions(-) rename arch/arm/{mach-tegra/include/mach/uncompress.h => include/debug/tegra-uncompress.h} (98%) rename arch/arm/{mach-tegra/include/mach/debug-macro.S => include/debug/tegra.S} (96%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index af34a43..78e11ed 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -345,6 +345,13 @@ choice Say Y here if you want kernel low-level debugging support on SOCFPGA based platforms. + config DEBUG_TEGRA_UART + depends on ARCH_TEGRA + bool "Use Tegra UART for low-level debug" + help + Say Y here if you want kernel low-level debugging support + on Tegra based platforms. + config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU @@ -418,12 +425,14 @@ config DEBUG_LL_INCLUDE default "debug/socfpga.S" if DEBUG_SOCFPGA_UART default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 + default "debug/tegra.S" if DEBUG_TEGRA_UART default "mach/debug-macro.S" config UNCOMPRESS_INCLUDE string default "debug/icedcc-uncompress.h" if DEBUG_ICEDCC default "debug/mvebu-uncompress.h" if DEBUG_MVEBU_UART + default "debug/tegra-uncompress.h" if DEBUG_TEGRA_UART default "debug/none-uncompress.h" if ARCH_MULTIPLATFORM || \ DEBUG_HIGHBANK_UART || \ DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \ diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/include/debug/tegra-uncompress.h similarity index 98% rename from arch/arm/mach-tegra/include/mach/uncompress.h rename to arch/arm/include/debug/tegra-uncompress.h index 937c4c5..da0f7e5 100644 --- a/arch/arm/mach-tegra/include/mach/uncompress.h +++ b/arch/arm/include/debug/tegra-uncompress.h @@ -1,6 +1,4 @@ /* - * arch/arm/mach-tegra/include/mach/uncompress.h - * * Copyright (C) 2010 Google, Inc. * Copyright (C) 2011 Google, Inc. * Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved. @@ -28,8 +26,8 @@ #include #include -#include -#include +#include "../../mach-tegra/include/mach/iomap.h" +#include "../../mach-tegra/include/mach/irammap.h" #define BIT(x) (1 << (x)) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/include/debug/tegra.S similarity index 96% rename from arch/arm/mach-tegra/include/mach/debug-macro.S rename to arch/arm/include/debug/tegra.S index 8ce0661..879511b 100644 --- a/arch/arm/mach-tegra/include/mach/debug-macro.S +++ b/arch/arm/include/debug/tegra.S @@ -1,6 +1,4 @@ /* - * arch/arm/mach-tegra/include/mach/debug-macro.S - * * Copyright (C) 2010,2011 Google, Inc. * Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved. * @@ -26,8 +24,8 @@ #include -#include -#include +#include "../../mach-tegra/include/mach/iomap.h" +#include "../../mach-tegra/include/mach/irammap.h" .macro addruart, rp, rv, tmp adr \rp, 99f @ actual addr of 99f