LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Paul Bolle <pebolle@tiscali.nl>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Valentin Rothberg <valentinrothberg@gmail.com>,
	Nicolas Ferre <nicolas.ferre@atmel.com>,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/7] ARM: at91: move debug-macro.S into the common space
Date: Tue, 20 Jan 2015 10:23:12 +0100	[thread overview]
Message-ID: <1421745792.9655.98.camel@x220> (raw)
In-Reply-To: <1421088136-10172-6-git-send-email-alexandre.belloni@free-electrons.com>

Alexandre,

On Mon, 2015-01-12 at 19:42 +0100, Alexandre Belloni wrote:
> Move debug-macro.S from include/mach/ to include/debug where all other common
> debug macros are.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

This patch became commit 5f58c97099f2 ("ARM: at91: move debug-macro.S
into the common space") in today's linux-next (ie, next-20150120). I
noticed because a script I use to check linux-next spotted a problem in
it.

>  MAINTAINERS                                           |  1 +
>  arch/arm/Kconfig.debug                                |  9 +++++++--
>  .../mach/debug-macro.S => include/debug/at91.S}       | 19 +++++++++++--------
>  3 files changed, 19 insertions(+), 10 deletions(-)
>  rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3589d67437f8..8c25979a3c43 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -877,6 +877,7 @@ F:	arch/arm/boot/dts/at91*.dts
>  F:	arch/arm/boot/dts/at91*.dtsi
>  F:	arch/arm/boot/dts/sama*.dts
>  F:	arch/arm/boot/dts/sama*.dtsi
> +F:	arch/arm/include/debug/at91.S
>  
>  ARM/ATMEL AT91 Clock Support
>  M:	Boris Brezillon <boris.brezillon@free-electrons.com>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 5ddd4906f7a7..e34d24949c6a 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -115,15 +115,18 @@ choice
>  		    0x80024000      | 0xf0024000     | UART9
>  
>  	config AT91_DEBUG_LL_DBGU0
> -		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
> +		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"
> +		select DEBUG_AT91_UART

There's no Kconfig symbol DEBUG_AT91_UART in linux-next. So this select
is currently a nop. Why was it added?

>  		depends on HAVE_AT91_DBGU0
>  
>  	config AT91_DEBUG_LL_DBGU1
> -		bool "Kernel low-level debugging on 9263 and 9g45"
> +		bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"
> +		select DEBUG_AT91_UART

Ditto.

>  		depends on HAVE_AT91_DBGU1
>  
>  	config AT91_DEBUG_LL_DBGU2
>  		bool "Kernel low-level debugging on sama5d4"
> +		select DEBUG_AT91_UART

Ditto.

>  		depends on HAVE_AT91_DBGU2
>  
>  	config DEBUG_BCM2835
> @@ -1165,6 +1168,8 @@ config DEBUG_LL_INCLUDE
>  	string
>  	default "debug/sa1100.S" if DEBUG_SA1100
>  	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
> +	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \
> +				AT91_DEBUG_LL_DBGU2
>  	default "debug/asm9260.S" if DEBUG_ASM9260_UART
>  	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
>  	default "debug/meson.S" if DEBUG_MESON_UARTAO

Thanks,


Paul Bolle


  reply	other threads:[~2015-01-20  9:23 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-12 18:42 [PATCH 0/7] AT91 cleanup for 3.20 #1 Alexandre Belloni
2015-01-12 18:42 ` [PATCH 1/7] ARM: at91: remove unused mach/memory.h Alexandre Belloni
2015-01-12 18:42 ` [PATCH 2/7] ARM: at91: remove useless config MACH_AT91RM9200_DT Alexandre Belloni
2015-01-12 18:42 ` [PATCH 3/7] ARM: at91: remove useless config MACH_AT91SAM9_DT Alexandre Belloni
2015-01-12 18:42 ` [PATCH 4/7] ARM: at91: remove useless at91_sysirq_mask_rtx Alexandre Belloni
2015-01-12 18:42 ` [PATCH 5/7] ARM: at91: move debug-macro.S into the common space Alexandre Belloni
2015-01-20  9:23   ` Paul Bolle [this message]
2015-01-20 10:54     ` [PATCH] ARM: at91: fix Kconfig.debug by adding DEBUG_AT91_UART option Nicolas Ferre
2015-01-23 23:03       ` Olof Johansson
2015-01-12 18:42 ` [PATCH 6/7] ARM: at91: remove useless at91rm9200_dt_initialize() Alexandre Belloni
2015-01-13  1:24   ` Bo Shen
2015-01-13 15:58     ` Nicolas Ferre
2015-01-12 18:42 ` [PATCH 7/7] ARM: at91: remove useless at91rm9200_set_type() Alexandre Belloni
2015-01-12 19:26 ` [PATCH 0/7] AT91 cleanup for 3.20 #1 Boris Brezillon
2015-01-15 14:09   ` Nicolas Ferre

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421745792.9655.98.camel@x220 \
    --to=pebolle@tiscali.nl \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=valentinrothberg@gmail.com \
    --subject='Re: [PATCH 5/7] ARM: at91: move debug-macro.S into the common space' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).