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

Commit f6628486 authored by Clément Péron's avatar Clément Péron Committed by Dinh Nguyen
Browse files

ARM: debug: enable UART1 for socfpga Cyclone5 



Cyclone5 and Arria10 doesn't have the same memory map for UART1.

Split the SOCFPGA_UART1 into 2 options to allow debugging on UART1 for Cyclone5.

Signed-off-by: default avatarClément Péron <peron.clem@gmail.com>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
parent 65102238

arch/arm/Kconfig.debug

+16 −7
Original line number Diff line number Diff line
@@ -1087,14 +1087,21 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SOCFPGA_UART1

	config DEBUG_SOCFPGA_ARRIA10_UART1

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA UART1 for low-level debug"

		bool "Use SOCFPGA Arria10 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Arria 10) based platforms.



	config DEBUG_SOCFPGA_CYCLONE5_UART1

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SUN9I_UART0

		bool "Kernel low-level debugging messages via sun9i UART0"
@@ -1655,7 +1662,8 @@ config DEBUG_UART_PHYS 
	default 0xfe800000 if ARCH_IOP32X

	default 0xff690000 if DEBUG_RK32_UART2

	default 0xffc02000 if DEBUG_SOCFPGA_UART0

	default 0xffc02100 if DEBUG_SOCFPGA_UART1

	default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xffd82340 if ARCH_IOP13XX

	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0

	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
@@ -1762,7 +1770,8 @@ config DEBUG_UART_VIRT 
	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0

	default 0xfeb31000 if DEBUG_KEYSTONE_UART1

	default 0xfec02000 if DEBUG_SOCFPGA_UART0

	default 0xfec02100 if DEBUG_SOCFPGA_UART1

	default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU

	default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE

	default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
@@ -1811,9 +1820,9 @@ config DEBUG_UART_8250_WORD 
	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250

	depends on DEBUG_UART_8250_SHIFT >= 2

	default y if DEBUG_PICOXCELL_UART || \

		DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_UART1 || \

		DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \

		DEBUG_ALPINE_UART0 || \

		DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \

		DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \

		DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2