Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions arch/arm/mach-aspeed/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ config ASPEED_PALLADIUM
This is mainly for internal verification and investigation
on HW design. If not sure, say N.

config ASPEED_ROUTE_UART5_TO_UART1
bool "Route UART5 console to UART1 pins"
depends on ASPEED_AST2500
help
Route UART5 console to TXD1/RXD1 pins instead of TXD5/RXD5 pins.
Does not affect the debug uart functionality.

config ASPEED_SSP_RERV_MEM
hex "Reserve memory for SSP"
default 0x0
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-aspeed/ast2500/platform.S
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ wait_ddr_reset:
/* end delay 10ms */

/* Debug - UART console message */
#ifdef CONFIG_DRAM_UART_TO_UART1
#ifdef CONFIG_ASPEED_ROUTE_UART5_TO_UART1
ldr r0, =0x1e78909c @ route UART5 to UART Port1, 2016.08.29
ldr r1, =0x10000004
str r1, [r0]
Expand Down