From mboxrd@z Thu Jan 1 00:00:00 1970 From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) Date: Fri, 16 Nov 2012 11:41:36 +0100 Subject: [PATCH 4/6] ARM: sunxi: Add earlyprintk support In-Reply-To: <1353019586-21043-5-git-send-email-maxime.ripard@free-electrons.com> References: <1353019586-21043-1-git-send-email-maxime.ripard@free-electrons.com> <1353019586-21043-5-git-send-email-maxime.ripard@free-electrons.com> Message-ID: <20121116114136.592dfa12@skate> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Dear Maxime Ripard, On Thu, 15 Nov 2012 23:46:23 +0100, Maxime Ripard wrote: > Signed-off-by: Maxime Ripard > --- > arch/arm/Kconfig.debug | 8 ++++++++ > arch/arm/include/debug/sunxi.S | 22 ++++++++++++++++++++++ > 2 files changed, 30 insertions(+) > create mode 100644 arch/arm/include/debug/sunxi.S > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index b0f3857..6672b02 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -345,6 +345,13 @@ choice > Say Y here if you want kernel low-level debugging support > on SOCFPGA based platforms. > > + config DEBUG_SUNXI_UART Should be DEBUG_SUNXI_UART1 > + bool "Kernel low-level debugging messages via sunXi UART" UART1. > + depends on ARCH_SUNXI > + help > + Say Y here if you want kernel low-level debugging support > + on Allwinner A1X based platforms. Say a few words about UART1 here. > + > config DEBUG_VEXPRESS_UART0_DETECT > bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" > depends on ARCH_VEXPRESS && CPU_CP15_MMU > @@ -416,6 +423,7 @@ config DEBUG_LL_INCLUDE > default "debug/mvebu.S" if DEBUG_MVEBU_UART > default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART > default "debug/socfpga.S" if DEBUG_SOCFPGA_UART > + default "debug/sunxi.S" if DEBUG_SUNXI_UART UART1 > default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ > DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 > default "mach/debug-macro.S" > diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S > new file mode 100644 > index 0000000..ffd101f > --- /dev/null > +++ b/arch/arm/include/debug/sunxi.S > @@ -0,0 +1,22 @@ > +/* > + * Early serial output macro for Allwinner A1X SoCs > + * > + * Copyright (C) 2012 Maxime Ripard > + * > + * Maxime Ripard > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > +*/ > + > +#define SUNXI_UART1_PHYS_BASE 0x01c28400 > +#define SUNXI_UART1_VIRT_BASE 0xf1c28400 Maybe: #ifdef CONFIG_DEBUG_SUNXI_UART1 #define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28400 #define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28400 #endif > + .macro addruart, rp, rv, tmp > + ldr \rp, =SUNXI_UART1_PHYS_BASE > + ldr \rv, =SUNXI_UART1_VIRT_BASE And use SUNXI_UART_DEBUG_{VIRT,PHYS}_BASE here. So that people can come and add CONFIG_DEBUG_SUNXI_UART0 for the Cubieboard a bit more easily. Or you can even provision the code for the UART0 as well. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com