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 <ambroise.vincent@arm.com>

diff --git a/plat/common/aarch32/platform_helpers.S b/plat/common/aarch32/platform_helpers.S
index e1e2a6f58ccdebb4521711e887405175e3296a85..5b9cb591460009ec333b6414adffdc7ebda7a6d0 100644 (file)
--- 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 <asm_macros.S>
 
        .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 b8fd3a2cd6f8f3db07c837bc93890345039598dc..bc650c96b2d5e2b0cbc6dc08896d5ca64f380a87 100644 (file)
--- a/plat/common/aarch64/platform_helpers.S
+++ b/plat/common/aarch64/platform_helpers.S
@@ -10,11 +10,6 @@
 #include <platform_def.h>
 
        .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 8af4f62d031b37d694c2665df7854d6c36595af5..94f9eaef9e2b492e44e63ef400c31a61edef1abc 100644 (file)
--- 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 d5894991db39eecaefc8b2aa8821bc8d0a8904e1..983ebe3da9f7e09bd8c86d3a5acb3cafd830c3f8 100644 (file)
--- 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 a9b1d8f0988324a2edfca78dfce11c01ccc1c9a4..cf6bae824af5cc7d690d7ac535a59d6a40654113 100644 (file)
--- 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 78e9b33ce3363fa25a4a1e2b695b35c778009b72..1532d9285d8e25ef5b064d759d86b3bbf3f9806f 100644 (file)
--- 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