From 41a61d416cee9baff28a48976b7bf598810a89a3 Mon Sep 17 00:00:00 2001 From: Biju Das Date: Sun, 11 Oct 2020 19:02:41 +0100 Subject: [PATCH] rcar_gen3: console: Fix BL31 boot failure This patch fixes the BL31 boot failure on Renesas RZ/G2M platform. Fixes: 75fab6496e5fce9a11 ("libc: memset: improve performance by avoiding single byte writes") Signed-off-by: Biju Das Change-Id: Iafcfac22070ca17ddad92d4efece8821165c8238 --- drivers/renesas/rcar/console/rcar_console.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/renesas/rcar/console/rcar_console.S b/drivers/renesas/rcar/console/rcar_console.S index 4d006b703..30425be63 100644 --- a/drivers/renesas/rcar/console/rcar_console.S +++ b/drivers/renesas/rcar/console/rcar_console.S @@ -33,20 +33,20 @@ * ----------------------------------------------- */ func console_rcar_register - mov x7, x30 - mov x6, x3 - cbz x6, register_fail - str x0, [x6, #CONSOLE_T_BASE] + mov x25, x30 + mov x24, x3 + cbz x24, register_fail + str x0, [x24, #CONSOLE_T_BASE] bl rcar_log_init cbz x0, register_fail - mov x0, x6 - mov x30, x7 + mov x0, x24 + mov x30, x25 finish_console_register rcar, putc=1, getc=0, flush=1 register_fail: - ret x7 + ret x25 endfunc console_rcar_register /* --------------------------------------------- -- 2.17.1