diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 10:52:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 10:52:44 -0800 |
| commit | e9f6d13513ea9fd33b0184db8fc33cf51baa584b (patch) | |
| tree | 281401f6a868b888e30465eac233e084ed6d8bb3 /arch/arm/Kconfig.debug | |
| parent | 41739b60b3c00e0591d1a413276ddfa0d0b1ea89 (diff) | |
| parent | 67bea88dd842deb3ed8327ad101970dbd615ddcb (diff) | |
| download | blackbird-op-linux-e9f6d13513ea9fd33b0184db8fc33cf51baa584b.tar.gz blackbird-op-linux-e9f6d13513ea9fd33b0184db8fc33cf51baa584b.zip | |
Merge branch 'sunxi/soc2' into next/soc
From Maxime Ripard:
Here is a pull request to add the support for Allwinner A10 SoCs.
* sunxi/soc2:
ARM: sunxi: Add sunxi restart function via onchip watchdog
ARM: sunxi: Add sun4i and cubieboard support
ARM: sunxi: Add earlyprintk support for UART0 (sun4i)
ARM: sunxi: Restructure sunxi dts/dtsi files
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4c336c3c4d7e..6783273f9e0b 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_UART0 + bool "Kernel low-level debugging messages via sunXi UART0" + depends on ARCH_SUNXI + help + Say Y here if you want kernel low-level debugging support + on Allwinner A1X based platforms on the UART0. + config DEBUG_SUNXI_UART1 bool "Kernel low-level debugging messages via sunXi UART1" depends on ARCH_SUNXI @@ -431,7 +438,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_UART1 + default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 default "mach/debug-macro.S" |
