From patchwork Thu Dec 17 16:14:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7874211 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F31DBBEEE5 for ; Thu, 17 Dec 2015 16:17:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B1832042A for ; Thu, 17 Dec 2015 16:17:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A4B9202FF for ; Thu, 17 Dec 2015 16:17:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a9bDQ-0004nS-BN; Thu, 17 Dec 2015 16:15:40 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a9bDM-00045c-Vr for linux-arm-kernel@lists.infradead.org; Thu, 17 Dec 2015 16:15:37 +0000 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0M5IbP-1aPaEE3p0h-00zUaG; Thu, 17 Dec 2015 17:15:02 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 09/10] ARM: debug-ll: reorder Kconfig alphanumerically Date: Thu, 17 Dec 2015 17:14:57 +0100 Message-ID: <2266750.YuAszZRgmA@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151217104508.GG8644@n2100.arm.linux.org.uk> References: <1449268242-808553-1-git-send-email-arnd@arndb.de> <1449268242-808553-10-git-send-email-arnd@arndb.de> <20151217104508.GG8644@n2100.arm.linux.org.uk> MIME-Version: 1.0 X-Provags-ID: V03:K0:ssBik+GtxwBoqrTQExSuv1iXTFdiN5DWrkRkM9+Y1hwZzfrJERj UWKog1D/PcJrZB2oFwhsIJ0ZmMtwxs686jt5EbVo+ixSTlrEXMDwErdQnwqyVVNbOs+nWRB HaxFs79trEGDR58m9/GyNpxqc8f0YwD79HV+tZDEt2fwuUrSLxp/2QqxmI7OdQGLpOWHTWJ nvRYA6qon5bradBuHsaCw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZnsaF09JUU4=:Jlcnd6TPX8DO0YQv62Mies 28jRFfEboa9YMpyP8sNO8hqlxOfKRPGBSKOkdvvGlPDTAMu8qZZjMjzF2wHic0ZdvCoxgFH3h ZA93xcNYFawWjT/2IhdmJCRQPvM100tasYN3LGa+9yNJpMN2my8dDUTApHXVSrX+2rcaqtLHu xICowcqwFSera0duBkxYe44cf+9Vg6xxKiOnqffeg92TxmKx5gHAJ/VFBwnX7zk98tjsfd9fF +q0hlE1kqDTRketkO47WJCkLgJWaWBIfvniDyfjCxHsjRg2Z+o30k3CNsZPp1FEXolSHS6/dL eEfZFHLSid9cP8ZNHlQLJFRtk9qLrUTRER+1envMLkgwutbLXwBPDm5HIThVU8HZgOMzLaBek aPkr/eZtJOqM2sYasmWxnpL35urr4ESZuP1STTLr6/exw5HRY6i04+UZkgKubxyaxmimGAJ3P 1mcSbn5fbNKcAwcGoc4wTdH1BwnApANnx6wFj39SJ15lQgu8STTzVjwo6aeKaJOoKST6KHA7N hUXJ8Y8laW8Vr+ZjUv4woWkjgWMAPwVeTzda2TgLggUvbPWMZyBDI7B9y3XUr8z04ZVPj3LJ1 8UvmdHQEskhMP3eDWdxcyr1gD4qB7swYvhQ3ECmmdQUk9TkNaTYRTKFoQkfSblle5MK0rFg2n 9u/k3g0gu8HkmLZqY7P9FNSBILGOdQ4YRLYBDAZnAeSx036HvtNKeKbH23lmGqM3vYAAjF1vm LcXOHRo1ESkt97Wz X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151217_081537_416687_BDECFD4E X-CRM114-Status: GOOD ( 23.76 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew@lunn.ch, daniel.thompson@linaro.org, Russell King - ARM Linux , jason@lakedaemon.net, linus.walleij@linaro.org, spear-devel@list.st.com, vz@mleia.com, arm@kernel.org, gregory.clement@free-electrons.com, ulli.kroll@googlemail.com, sebastian.hesselbarth@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thursday 17 December 2015 10:45:08 Russell King - ARM Linux wrote: > On Fri, Dec 04, 2015 at 11:30:41PM +0100, Arnd Bergmann wrote: > > + config DEBUG_LL_UART_EFM32 > > + bool "Kernel low-level debugging via efm32 UART" > > + depends on ARCH_EFM32 > > + help > > + Say Y here if you want the debug print routines to direct > > + their output to an UART or USART port on efm32 based > > + machines. Use the following addresses for DEBUG_UART_PHYS: > > + > > + 0x4000c000 | USART0 > > + 0x4000c400 | USART1 > > + 0x4000c800 | USART2 > > + 0x4000e000 | UART0 > > + 0x4000e400 | UART1 > > + > > NAK. The DEBUG_LL options are _supposed_ to be at the end - this option > was correctly positioned: Ok, got it. I thought about this briefly when I did the reorganization but assumed it was not intentional and just oddly named. DEBUG_LL_UART_EFM32 it a bit different from all the other options, so either location seemed reasonable: * like DEBUG_LL_UART_8250 and DEBUG_LL_UART_PL01X, we don't configure a particular address based on the platform, and the naming is consistent with those options. * like all other options, it specific to one particular platform, and simply turning on DEBUG_LL from a defconfig file without selecting a particular target ends up picking the first one, and that is intentionally a platform specific option, so we don't have to pick one explicitly. I've queued up the patch below to avoid having to rebuild the entire next/multiplatform branch, let me know if you'd rather see that branch rebuilt. Arnd From 06920d4eeabcd824436ace6fbd6cf49739a5812a Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 17 Dec 2015 16:59:55 +0100 Subject: [PATCH] ARM: debug-ll: move DEBUG_LL_UART_EFM32 to correct Kconfig location I accidentally move the DEBUG_LL_UART_EFM32 option when sorting all other options alphanumerically, but it belongs into the same group as DEBUG_LL_UART_8250 and DEBUG_LL_UART_PL01X. Signed-off-by: Arnd Bergmann Fixes: 1dc9341 ("ARM: debug-ll: reorder Kconfig alphanumerically") diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 3626b8b..776fc7c 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -246,20 +246,6 @@ choice Say Y here if you want the debug print routines to direct their output to the UA0 serial port in the CX92755. - config DEBUG_LL_UART_EFM32 - bool "Kernel low-level debugging via efm32 UART" - depends on ARCH_EFM32 - help - Say Y here if you want the debug print routines to direct - their output to an UART or USART port on efm32 based - machines. Use the following addresses for DEBUG_UART_PHYS: - - 0x4000c000 | USART0 - 0x4000c400 | USART1 - 0x4000c800 | USART2 - 0x4000e000 | UART0 - 0x4000e400 | UART1 - config DEBUG_EP93XX bool "Kernel low-level debugging messages via ep93xx UART" depends on ARCH_EP93XX @@ -1299,6 +1285,20 @@ choice options; the platform specific options are deprecated and will be soon removed. + config DEBUG_LL_UART_EFM32 + bool "Kernel low-level debugging via efm32 UART" + depends on ARCH_EFM32 + help + Say Y here if you want the debug print routines to direct + their output to an UART or USART port on efm32 based + machines. Use the following addresses for DEBUG_UART_PHYS: + + 0x4000c000 | USART0 + 0x4000c400 | USART1 + 0x4000c800 | USART2 + 0x4000e000 | UART0 + 0x4000e400 | UART1 + config DEBUG_LL_UART_PL01X bool "Kernel low-level debugging via ARM Ltd PL01x Primecell UART" help