From patchwork Thu Mar 14 22:07:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15356 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F004123E39 for ; Thu, 14 Mar 2013 22:07:46 +0000 (UTC) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by fiordland.canonical.com (Postfix) with ESMTP id ABC98A1814D for ; Thu, 14 Mar 2013 22:07:46 +0000 (UTC) Received: by mail-vc0-f174.google.com with SMTP id hx10so788926vcb.33 for ; Thu, 14 Mar 2013 15:07:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-provags-id:x-gm-message-state; bh=zLbPI9lPoODW6cFcM0QtZj+f19QRXi2KFP72b8X0am4=; b=Uun0DxCzIVNZ3qKxX8NgsHIGZEKL2u1Qon5lTDt1NRYq/3FE2ldeAnk+JJ/EvNKhTK SO8nHWspqt+YmZl7yZNLXOVoS1tUto10SmMCzTBd6kEoFh766fkOmu2W3VNe/7z5rcIC IRB8ugHM3I07P13Z4y3n7fZ7K/M+JfnMBdeyU7ftQRBiSs2fqQQB8747JH6lzCFNPvXK KXxLDmhEZV8ajB3tYbDEmNO4bs9B3ypPi9smEGWjVNcROziJ1psoPlIs6RXPv2PUdZJz Zcwa46IRWv7IPZ66yaGM5+j3NbXfna7UkOm8YAJ1v+YJ3UnxkCjUpNr6GA3QjeFb6QLJ b7xw== X-Received: by 10.52.93.235 with SMTP id cx11mr3414821vdb.51.1363298866070; Thu, 14 Mar 2013 15:07:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp93676veb; Thu, 14 Mar 2013 15:07:45 -0700 (PDT) X-Received: by 10.14.4.69 with SMTP id 45mr11461864eei.0.1363298864420; Thu, 14 Mar 2013 15:07:44 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTPS id r7si7399539eeo.122.2013.03.14.15.07.43 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 15:07:44 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MIPbr-1UJHVp2Oqd-003wEP; Thu, 14 Mar 2013 23:07:42 +0100 From: Arnd Bergmann To: Anton Vorontsov Cc: linux-arm-kernel@vger.kernel.org, patches@linaro.org, Olof Johansson , Florian Fainelli , Imre Kaloz , Arnd Bergmann Subject: [PATCH 3/5] ARM: cns3xxx: move debug_ll code to include/debug/ Date: Thu, 14 Mar 2013 23:07:35 +0100 Message-Id: <1363298857-8131-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363298857-8131-1-git-send-email-arnd@arndb.de> References: <1363298857-8131-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:i2Zwto7j8JhVuyHhUadcv5m0L+AvzZma0A1X2qzF+n5 O/jlKrY2rF2qFYrO6BwM5g1qVnnN8L3+vCs70ttgwIZFFTajOX 7Iu/XM0Cuai6gKz2IQjCKOf3O+dtEx9XKxJ+H52bjdJDQcWujO AX1kXKLe2DQGQAasC/hOaA/1z6aZ3PaKA4jyJNIZ5LnlRDSJi5 YWPYAUx1Wv88LHH2Vz8eXkd8fCLp/n7diz68F0Wd/0kC10tzoU hOr1/aZ3HjjA5UDUPT76KUgdu/+/yNWV+3Em1Mf9X9UGEaSoG3 R8M7YbNl2atl+KsUhdoVvHK9PYSRQ3SwYTVuusOnvsi5J/VoK7 FbCIXwsSrK1EPVv9KDNl9XLZjQEaBhgwyf4NgPcJn X-Gm-Message-State: ALoCoQkAcAtcPPeMP1mPCC8lAE/7T+fiNqirp41lXhD2EeieyttA5NmOEMcTQj2SBk/48vsh6McF 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