aboutsummaryrefslogtreecommitdiff
path: root/plat/rpi/rpi4/aarch64
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2020-03-10 12:33:16 +0000
committerAndre Przywara <andre.przywara@arm.com>2020-03-17 12:44:09 +0000
commit795aefe5e80494018c731cea69e2284140f4abbb (patch)
tree14486ff3182615e9b8d7e3d59ce72d35f5209d2e /plat/rpi/rpi4/aarch64
parent0d92745e101b95a19c34dd6e2d1eccc2d9fcb629 (diff)
downloadarm-trusted-firmware-795aefe5e80494018c731cea69e2284140f4abbb.tar.gz
rpi3: console: Use same "clock-less" setup scheme as RPi4
In the wake of the upcoming unification of the console setup code between RPi3 and RPi4, extend the "clock-less" setup scheme to the RPi3. This avoid programming any clocks or baud rate registers, which makes the port more robust against GPU firmware changes. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Change-Id: Ida83a963bb18a878997e9cbd55f8ceac6a2e1c1f
Diffstat (limited to 'plat/rpi/rpi4/aarch64')
-rw-r--r--plat/rpi/rpi4/aarch64/plat_helpers.S8
1 files changed, 3 insertions, 5 deletions
diff --git a/plat/rpi/rpi4/aarch64/plat_helpers.S b/plat/rpi/rpi4/aarch64/plat_helpers.S
index 083c30e71..fac1b2075 100644
--- a/plat/rpi/rpi4/aarch64/plat_helpers.S
+++ b/plat/rpi/rpi4/aarch64/plat_helpers.S
@@ -10,8 +10,6 @@
#include <platform_def.h>
#include <cortex_a72.h>
-#include "../include/rpi_hw.h"
-
.globl plat_crash_console_flush
.globl plat_crash_console_init
.globl plat_crash_console_putc
@@ -135,7 +133,7 @@ endfunc platform_mem_init
* ---------------------------------------------
*/
func plat_crash_console_init
- mov_imm x0, PLAT_RPI3_UART_BASE
+ mov_imm x0, PLAT_RPI_MINI_UART_BASE
mov x1, xzr
mov x2, xzr
b console_16550_core_init
@@ -149,7 +147,7 @@ endfunc plat_crash_console_init
* ---------------------------------------------
*/
func plat_crash_console_putc
- mov_imm x1, PLAT_RPI3_UART_BASE
+ mov_imm x1, PLAT_RPI_MINI_UART_BASE
b console_16550_core_putc
endfunc plat_crash_console_putc
@@ -162,7 +160,7 @@ endfunc plat_crash_console_putc
* ---------------------------------------------
*/
func plat_crash_console_flush
- mov_imm x0, PLAT_RPI3_UART_BASE
+ mov_imm x0, PLAT_RPI_MINI_UART_BASE
b console_16550_core_flush
endfunc plat_crash_console_flush