From 2cc97771700aafa5db9a6f8d0b0ea4cb17ffb718 Mon Sep 17 00:00:00 2001 From: Ambroise Vincent Date: Wed, 27 Mar 2019 13:48:15 +0000 Subject: [PATCH] Remove deprecated plat_crash_console_* The default implementations are defined in crash_console_helpers.S. The platforms have to define plat_crash_console_*. Implemented placeholders for platforms that were missing helpers. Change-Id: Iea60b6f851956916e421dfd8c34a62d96eb9148e Signed-off-by: Ambroise Vincent --- plat/common/aarch32/platform_helpers.S | 38 +-------------------- plat/common/aarch64/platform_helpers.S | 20 ----------- plat/mediatek/mt6795/aarch64/plat_helpers.S | 16 ++++++++- plat/mediatek/mt8173/aarch64/plat_helpers.S | 16 ++++++++- plat/qemu/aarch32/plat_helpers.S | 16 ++++++++- plat/xilinx/versal/platform.mk | 3 +- 6 files changed, 48 insertions(+), 61 deletions(-) diff --git a/plat/common/aarch32/platform_helpers.S b/plat/common/aarch32/platform_helpers.S index e1e2a6f58..5b9cb5914 100644 --- a/plat/common/aarch32/platform_helpers.S +++ b/plat/common/aarch32/platform_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,11 +8,6 @@ #include .weak plat_report_exception -#if !ERROR_DEPRECATED - .weak plat_crash_console_init - .weak plat_crash_console_putc - .weak plat_crash_console_flush -#endif .weak plat_reset_handler .weak plat_disable_acp .weak bl1_plat_prepare_exit @@ -28,37 +23,6 @@ func plat_report_exception bx lr endfunc plat_report_exception -#if !ERROR_DEPRECATED - /* ----------------------------------------------------- - * Placeholder function which should be redefined by - * each platform. - * ----------------------------------------------------- - */ -func plat_crash_console_init - mov r0, #0 - bx lr -endfunc plat_crash_console_init - - /* ----------------------------------------------------- - * Placeholder function which should be redefined by - * each platform. - * ----------------------------------------------------- - */ -func plat_crash_console_putc - bx lr -endfunc plat_crash_console_putc - - /* ----------------------------------------------------- - * Placeholder function which should be redefined by - * each platform. - * ----------------------------------------------------- - */ -func plat_crash_console_flush - mov r0, #0 - bx lr -endfunc plat_crash_console_flush -#endif - /* ----------------------------------------------------- * Placeholder function which should be redefined by * each platform. diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S index b8fd3a2cd..bc650c96b 100644 --- a/plat/common/aarch64/platform_helpers.S +++ b/plat/common/aarch64/platform_helpers.S @@ -10,11 +10,6 @@ #include .weak plat_report_exception -#if !ERROR_DEPRECATED - .weak plat_crash_console_init - .weak plat_crash_console_putc - .weak plat_crash_console_flush -#endif .weak plat_reset_handler .weak plat_disable_acp .weak bl1_plat_prepare_exit @@ -37,21 +32,6 @@ func plat_report_exception ret endfunc plat_report_exception -#if !ERROR_DEPRECATED -func plat_crash_console_init - mov x0, #0 - ret -endfunc plat_crash_console_init - -func plat_crash_console_putc - ret -endfunc plat_crash_console_putc - -func plat_crash_console_flush - ret -endfunc plat_crash_console_flush -#endif /* ERROR_DEPRECATED */ - /* ----------------------------------------------------- * Placeholder function which should be redefined by * each platform. This function should preserve x19 - x29. diff --git a/plat/mediatek/mt6795/aarch64/plat_helpers.S b/plat/mediatek/mt6795/aarch64/plat_helpers.S index 8af4f62d0..94f9eaef9 100644 --- a/plat/mediatek/mt6795/aarch64/plat_helpers.S +++ b/plat/mediatek/mt6795/aarch64/plat_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,6 +12,7 @@ .globl platform_is_primary_cpu .globl plat_crash_console_init .globl plat_crash_console_putc + .globl plat_crash_console_flush .globl platform_mem_init @@ -121,6 +122,19 @@ func plat_crash_console_putc ret endfunc plat_crash_console_putc + /* --------------------------------------------- + * int plat_crash_console_flush(int c) + * Function to force a write of all buffered + * data that hasn't been output. + * Out : return -1 on error else return 0. + * Clobber list : x0, x1 + * --------------------------------------------- + */ +func plat_crash_console_flush + mov_imm x0, UART0_BASE + b console_core_flush +endfunc plat_crash_console_flush + /* -------------------------------------------------------- * void platform_mem_init (void); * diff --git a/plat/mediatek/mt8173/aarch64/plat_helpers.S b/plat/mediatek/mt8173/aarch64/plat_helpers.S index d5894991d..983ebe3da 100644 --- a/plat/mediatek/mt8173/aarch64/plat_helpers.S +++ b/plat/mediatek/mt8173/aarch64/plat_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -13,6 +13,7 @@ .globl plat_my_core_pos .globl plat_crash_console_init .globl plat_crash_console_putc + .globl plat_crash_console_flush /* ----------------------------------------------------- * void plat_secondary_cold_boot_setup (void); @@ -75,3 +76,16 @@ func plat_crash_console_putc mov_imm x1, MT8173_UART0_BASE b console_core_putc endfunc plat_crash_console_putc + + /* --------------------------------------------- + * int plat_crash_console_flush(int c) + * Function to force a write of all buffered + * data that hasn't been output. + * Out : return -1 on error else return 0. + * Clobber list : x0, x1 + * --------------------------------------------- + */ +func plat_crash_console_flush + mov_imm x0, MT8173_UART0_BASE + b console_core_flush +endfunc plat_crash_console_flush diff --git a/plat/qemu/aarch32/plat_helpers.S b/plat/qemu/aarch32/plat_helpers.S index a9b1d8f09..cf6bae824 100644 --- a/plat/qemu/aarch32/plat_helpers.S +++ b/plat/qemu/aarch32/plat_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,6 +15,7 @@ .globl plat_qemu_calc_core_pos .globl plat_crash_console_init .globl plat_crash_console_putc + .globl plat_crash_console_flush .globl plat_secondary_cold_boot_setup .globl plat_get_my_entrypoint .globl plat_is_my_cpu_primary @@ -117,3 +118,16 @@ func plat_crash_console_putc b console_core_putc endfunc plat_crash_console_putc + /* --------------------------------------------- + * int plat_crash_console_flush(int c) + * Function to force a write of all buffered + * data that hasn't been output. + * Out : return -1 on error else return 0. + * Clobber list : x0, x1 + * --------------------------------------------- + */ +func plat_crash_console_flush + mov_imm r0, PLAT_QEMU_CRASH_UART_BASE + b console_core_flush +endfunc plat_crash_console_flush + diff --git a/plat/xilinx/versal/platform.mk b/plat/xilinx/versal/platform.mk index 78e9b33ce..1532d9285 100644 --- a/plat/xilinx/versal/platform.mk +++ b/plat/xilinx/versal/platform.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause @@ -48,6 +48,7 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ drivers/arm/gic/v3/gicv3_main.c \ drivers/arm/gic/v3/gicv3_helpers.c \ drivers/arm/pl011/aarch64/pl011_console.S \ + plat/common/aarch64/crash_console_helpers.S \ plat/common/plat_gicv3.c \ plat/xilinx/versal/aarch64/versal_helpers.S \ plat/xilinx/versal/aarch64/versal_common.c