ARM: 7793/1: debug: use generic option for ep93xx PL10x debug port (d2c215aa) · Commits · 戴 / test

The generic option DEBUG_LL_UART_PL01X is now used to select the UART type for the kernel low-level debugging on the ep93xx platform. This enables two config options to provide the physical and virtual base address of the debug UART. Use the generic options instead of providing platform specific options to select the debug UART. UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000 DEBUG_UART_VIRT = 0xfedc0000 UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000 DEBUG_UART_VIRT = 0xfedd0000 UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000 DEBUG_UART_VIRT = 0xfede0000 The selected UART must already be initialized by the bootloader. If it isn't setup nothing will appear (which might be desired). Signed-off-by:

H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ryan Mallon <rmallon@gmail.com> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-ep93xx/Kconfig

+0 −14

Original line number	Diff line number	Diff line
		@@ -194,20 +194,6 @@ config MACH_VISION_EP9307
		Say 'Y' here if you want your kernel to support the
		Vision Engraving Systems EP9307 SoM.

		choice
		prompt "Select a UART for early kernel messages"

		config EP93XX_EARLY_UART1
		bool "UART1"

		config EP93XX_EARLY_UART2
		bool "UART2"

		config EP93XX_EARLY_UART3
		bool "UART3"

		endchoice

		endmenu

		endif

arch/arm/mach-ep93xx/include/mach/uncompress.h

+2 −12

Original line number	Diff line number	Diff line
		@@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
		((volatile unsigned int )ptr) = value;
		}

		#if defined(CONFIG_EP93XX_EARLY_UART1)
		#define UART_BASE EP93XX_UART1_PHYS_BASE
		#elif defined(CONFIG_EP93XX_EARLY_UART2)
		#define UART_BASE EP93XX_UART2_PHYS_BASE
		#elif defined(CONFIG_EP93XX_EARLY_UART3)
		#define UART_BASE EP93XX_UART3_PHYS_BASE
		#else
		#define UART_BASE EP93XX_UART1_PHYS_BASE
		#endif

		#define PHYS_UART_DATA (UART_BASE + 0x00)
		#define PHYS_UART_FLAG (UART_BASE + 0x18)
		#define PHYS_UART_DATA (CONFIG_DEBUG_UART_PHYS + 0x00)
		#define PHYS_UART_FLAG (CONFIG_DEBUG_UART_PHYS + 0x18)
		#define UART_FLAG_TXFF 0x20

		static inline void putc(int c)

Admin message