From patchwork Thu Sep 6 20:12:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1417701 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3F362DFFCF for ; Thu, 6 Sep 2012 20:17:37 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9iSy-0006Qo-K2; Thu, 06 Sep 2012 20:14:21 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9iRx-0006CX-Ko for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 20:13:20 +0000 Received: by mail-ob0-f177.google.com with SMTP id ta17so3374777obb.36 for ; Thu, 06 Sep 2012 13:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=tY/txljSGeNtUiF/nd4y24mYsb2ZwYueYydR6NZ+6y8=; b=zsywr5XD/R63AdRUo8dh+oZuBIE0mh4l5jzFu27uoTZKx2u121gs/M8HTbV0YUmii9 Hx3HVmXG6zwsSZbSRqQdpCAjpjvk0Y7l03EHEPA3m++OXTKexOSUD4OrLG7C9xlWxDxY JU/+RUOYdGGM3D1Vs5qQQjRzDhlCQYdRaetq121PIn0vy1IBeAZK72uQchRYMGLOIlk7 lSS4CoG749TrponkIhaUWRglQaz9WWuDoNNy0QtL6TkoOmA2YN6+2/iQQBNYRPMbeRVi TA6JtoZ3yJwZicAzTPzAbefuZDewzdTxz+IPUq8i3sqV6InjzKsTfeNDnuQYbuCjaXOL RoFQ== Received: by 10.182.169.37 with SMTP id ab5mr3584655obc.82.1346962397359; Thu, 06 Sep 2012 13:13:17 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id n8sm2259708oec.5.2012.09.06.13.13.16 (version=SSLv3 cipher=OTHER); Thu, 06 Sep 2012 13:13:16 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/12] ARM: socfpga: move debug macros to include/debug Date: Thu, 6 Sep 2012 15:12:48 -0500 Message-Id: <1346962375-26163-6-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346962375-26163-1-git-send-email-robherring2@gmail.com> References: <1346962375-26163-1-git-send-email-robherring2@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Olof Johansson , Dinh Nguyen , Russell King , Rob Herring , Arnd Bergmann 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: Rob Herring Move socfpga debug-macro.S over to common debug macro directory. Signed-off-by: Rob Herring Cc: Dinh Nguyen Acked-by: Dinh Nguyen Acked-by: Dinh Nguyen --- arch/arm/Kconfig.debug | 8 ++++++++ .../mach/debug-macro.S => include/debug/socfpga.S} | 0 2 files changed, 8 insertions(+) rename arch/arm/{mach-socfpga/include/mach/debug-macro.S => include/debug/socfpga.S} (100%) diff --git a/arch/arm/mach-socfpga/include/mach/debug-macro.S b/arch/arm/include/debug/socfpga.S similarity index 100% rename from arch/arm/mach-socfpga/include/mach/debug-macro.S rename to arch/arm/include/debug/socfpga.S diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 3bafdd2..aa56934 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -317,6 +317,13 @@ choice The uncompressor code port configuration is now handled by CONFIG_S3C_LOWLEVEL_UART_PORT. + config DEBUG_SOCFPGA_UART + depends on ARCH_SOCFPGA + bool "Use SOCFPGA UART for low-level debug" + help + Say Y here if you want kernel low-level debugging support + on SOCFPGA based platforms. + config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU @@ -385,6 +392,7 @@ config DEBUG_LL_INCLUDE default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "debug/mvebu.S" if DEBUG_MVEBU_UART + 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 "mach/debug-macro.S"