Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 164acf96 authored by Stephen Boyd's avatar Stephen Boyd Committed by Russell King
Browse files

ARM: 7096/1: debug: Add UART1 config choices 



ARM patch 7072/1 (debug: use kconfig choice for selecting
DEBUG_LL UART) didn't notice that the Kconfigs relied on being
unselected to configure a different serial port. Since there is
no NONE option in a choice menu, explicitly add the other option
so that both serial ports can be selected.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4f5ef922

arch/arm/Kconfig.debug

+15 −4
Original line number Diff line number Diff line
@@ -81,14 +81,27 @@ choice 
	prompt "Kernel low-level debugging port"

	depends on DEBUG_LL





	config DEBUG_FOOTBRIDGE_COM1

		bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"

		depends on FOOTBRIDGE

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the 8250 at PCI COM1.



	config DEBUG_DC21285_PORT

		bool "Kernel low-level debugging messages via footbridge serial port"

		depends on FOOTBRIDGE

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port in the DC21285 (Footbridge).

		  Saying N will cause the debug messages to appear on the first

		  16550 serial port.



	config DEBUG_CLPS711X_UART1

		bool "Kernel low-level debugging messages via UART1"

		depends on ARCH_CLPS711X

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the first serial port on these devices.



	config DEBUG_CLPS711X_UART2

		bool "Kernel low-level debugging messages via UART2"
@@ -96,8 +109,6 @@ choice 
		help

		  Say Y here if you want the debug print routines to direct

		  their output to the second serial port on these devices.

		  Saying N will cause the debug messages to appear on the first

		  serial port.



endchoice