From patchwork Thu Mar 14 22:14:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2274231 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 C80C4DFB79 for ; Thu, 14 Mar 2013 22:21:19 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UGGTl-0003i4-9G; Thu, 14 Mar 2013 22:18:29 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UGGQ0-0001Q5-Aa for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2013 22:14:37 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lb6xp-1V0tiF02VV-00lGY0; Thu, 14 Mar 2013 23:14:34 +0100 From: Arnd Bergmann To: Anton Vorontsov Subject: [PATCH 3/5] ARM: cns3xxx: move debug_ll code to include/debug/ Date: Thu, 14 Mar 2013 23:14:29 +0100 Message-Id: <1363299271-8283-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363299271-8283-1-git-send-email-arnd@arndb.de> References: <1363299271-8283-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:SxkZE0yPDKYaA3U61vgHFn83SfKZvHrmjxClygRl800 8vXHuCHFB+b5C0riCD1ZwEEIvaSlgvaMr0JbrRL6yus1ZArVgm 2tU7xk6NRdk+9nlrvKca7Aq3X5TqGKZTnYcyhNtBuIpbPkWGP4 o+0Sfj/pvlAL7vy7C9Sa+QNb2ziHlJwqa5sgDrsquiqktuymee UUaqCF+w9yV7LIWpVCRDyrpIeYiB5lRsWDscIYYVUa2Rr3ORqh v5kqsgG3xHSjr/pG8WbKVf4TwlT7n+3Qc6JJgAD8e8LC/5zLa4 j58ER/R/a9CvViDil98s9Bl7imtRQ6aAM9Qs7o2EYzwIoL2QSX bN/374TZItWtFQ1XiH/atUVWOwzjqox9x//pyLyMc X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130314_181436_653886_69826FCA X-CRM114-Status: UNSURE ( 7.16 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Olof Johansson , Imre Kaloz , Arnd Bergmann , Florian Fainelli , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 This is needed in order to keep debug_ll functionality on cns3xxx working when we enable ARCH_MULTIPLATFORM. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig.debug | 8 ++++++++ arch/arm/configs/cns3420vb_defconfig | 1 + .../include/mach/debug-macro.S => include/debug/cns3xxx.S} | 0 3 files changed, 9 insertions(+) rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%) diff --git a/arch/arm/mach-cns3xxx/include/mach/debug-macro.S b/arch/arm/include/debug/cns3xxx.S similarity index 100% rename from arch/arm/mach-cns3xxx/include/mach/debug-macro.S rename to arch/arm/include/debug/cns3xxx.S diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index acdddda..52f410d 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -103,6 +103,13 @@ choice Say Y here if you want the debug print routines to direct their output to the second serial port on these devices. + config DEBUG_CNS3XXX + bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx" + depends on ARCH_CNS3XXX + help + Say Y here if you want the debug print routines to direct + their output to the CNS3xxx UART0. + config DEBUG_DAVINCI_DA8XX_UART1 bool "Kernel low-level debugging on DaVinci DA8XX using UART1" depends on ARCH_DAVINCI_DA8XX @@ -579,6 +586,7 @@ endchoice config DEBUG_LL_INCLUDE string + default "debug/cns3xxx.S" if DEBUG_CNS3XXX default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/imx.S" if DEBUG_IMX1_UART || \ DEBUG_IMX25_UART || \ diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig index 313627a..b79e984 100644 --- a/arch/arm/configs/cns3420vb_defconfig +++ b/arch/arm/configs/cns3420vb_defconfig @@ -21,6 +21,7 @@ CONFIG_MODVERSIONS=y CONFIG_IOSCHED_CFQ=m CONFIG_ARCH_CNS3XXX=y CONFIG_MACH_CNS3420VB=y +CONFIG_DEBUG_CNS3XXX=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0