summaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2014-11-11 15:54:09 +0000
committerdanh-arm <dan.handley@arm.com>2014-11-11 15:54:09 +0000
commit435cdcf42be8b4540a7a0d112b33da19429cc654 (patch)
tree89f17ae3e1e11751b81dae9997584d70b16816bb /plat
parent6f80d60bb8a01a4d2acd8e10b628c8dc8bcbb14f (diff)
parentce6ee933997b61baff55d652f9bfa9ace4dcd1f9 (diff)
Merge pull request #220 from soby-mathew/sm/reassign_crash_console
Use the BL3-1 runtime console as the crash console.
Diffstat (limited to 'plat')
-rw-r--r--plat/fvp/aarch64/fvp_helpers.S4
-rw-r--r--plat/juno/aarch64/plat_helpers.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/fvp/aarch64/fvp_helpers.S b/plat/fvp/aarch64/fvp_helpers.S
index e4749e03..e678b436 100644
--- a/plat/fvp/aarch64/fvp_helpers.S
+++ b/plat/fvp/aarch64/fvp_helpers.S
@@ -199,7 +199,7 @@ func platform_is_primary_cpu
ret
/* Define a crash console for the plaform */
-#define FVP_CRASH_CONSOLE_BASE PL011_UART0_BASE
+#define FVP_CRASH_CONSOLE_BASE PL011_UART1_BASE
/* ---------------------------------------------
* int plat_crash_console_init(void)
@@ -210,7 +210,7 @@ func platform_is_primary_cpu
*/
func plat_crash_console_init
mov_imm x0, FVP_CRASH_CONSOLE_BASE
- mov_imm x1, PL011_UART0_CLK_IN_HZ
+ mov_imm x1, PL011_UART1_CLK_IN_HZ
mov_imm x2, PL011_BAUDRATE
b console_core_init
diff --git a/plat/juno/aarch64/plat_helpers.S b/plat/juno/aarch64/plat_helpers.S
index 1721a0ae..028a1a57 100644
--- a/plat/juno/aarch64/plat_helpers.S
+++ b/plat/juno/aarch64/plat_helpers.S
@@ -44,7 +44,7 @@
.globl platform_mem_init
/* Define a crash console for the plaform */
-#define JUNO_CRASH_CONSOLE_BASE PL011_UART0_BASE
+#define JUNO_CRASH_CONSOLE_BASE PL011_UART3_BASE
/* ---------------------------------------------
* int plat_crash_console_init(void)
@@ -55,7 +55,7 @@
*/
func plat_crash_console_init
mov_imm x0, JUNO_CRASH_CONSOLE_BASE
- mov_imm x1, PL011_UART0_CLK_IN_HZ
+ mov_imm x1, PL011_UART3_CLK_IN_HZ
mov_imm x2, PL011_BAUDRATE
b console_core_init