summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-08 09:39:54 -0500
committerTom Rini <trini@konsulko.com>2016-02-08 09:39:54 -0500
commit7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (patch)
treece65e5e7efbf82d0223bcc4b7bf0efbf5648e953 /arch
parent5c884420a5752163ce738701701ae1874d8f466d (diff)
parente4f348ba6f070789e6505cc65cf6683421674637 (diff)
downloadu-boot-imx-7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e.zip
u-boot-imx-7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e.tar.gz
u-boot-imx-7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'arch')
-rw-r--r--arch/nios2/cpu/start.S7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index 204d0cd..3e1b0c9 100644
--- a/arch/nios2/cpu/start.S
+++ b/arch/nios2/cpu/start.S
@@ -106,6 +106,13 @@ _reloc:
stw r0, 4(sp)
mov fp, sp
+#ifdef CONFIG_DEBUG_UART
+ /* Set up the debug UART */
+ movhi r2, %hi(debug_uart_init@h)
+ ori r2, r2, %lo(debug_uart_init@h)
+ callr r2
+#endif
+
/* Allocate and initialize reserved area, update SP */
mov r4, sp
movhi r2, %hi(board_init_f_alloc_reserve@h)