From c88feda145cd3d602fef9057db9322f781a7763a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 17 Jul 2024 18:38:07 +0200 Subject: [PATCH] bsp/virtex4: Use default fatal extension Update #5067. --- bsps/powerpc/virtex4/include/bsp.h | 2 - bsps/powerpc/virtex4/start/bspclean.c | 54 ------------------- bsps/powerpc/virtex4/start/bspstart.c | 8 --- .../build/bsps/powerpc/virtex4/bspvirtex4.yml | 2 +- 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 bsps/powerpc/virtex4/start/bspclean.c diff --git a/bsps/powerpc/virtex4/include/bsp.h b/bsps/powerpc/virtex4/include/bsp.h index dc9d4cd0a5..c9a4e25162 100644 --- a/bsps/powerpc/virtex4/include/bsp.h +++ b/bsps/powerpc/virtex4/include/bsp.h @@ -81,8 +81,6 @@ extern "C" { #endif -void BSP_ask_for_reset(void); - /* * Prototypes for BSP methods shared across file boundaries */ diff --git a/bsps/powerpc/virtex4/start/bspclean.c b/bsps/powerpc/virtex4/start/bspclean.c deleted file mode 100644 index bd5829e0b2..0000000000 --- a/bsps/powerpc/virtex4/start/bspclean.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This routine normally is part of start.s and usually returns - * control to a monitor. - * - * INPUT: NONE - * - * OUTPUT: NONE - * - * Author: Andrew Bray - * - * COPYRIGHT (c) 1995 by i-cubed ltd. - * - * To anyone who acknowledges that this file is provided "AS IS" - * without any express or implied warranty: - * permission to use, copy, modify, and distribute this file - * for any purpose is hereby granted without fee, provided that - * the above copyright notice and this notice appears in all - * copies, and that the name of i-cubed limited not be used in - * advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * i-cubed limited makes no representations about the suitability - * of this software for any purpose. - * - * Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/bspclean.c: - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include -#include - -static void _noopfun(void) {} - -void app_bsp_cleanup(void) -__attribute__(( weak, alias("_noopfun") )); - -void bsp_fatal_extension( - rtems_fatal_source source, - bool always_set_to_false, - rtems_fatal_code error -) -{ - if ( source == RTEMS_FATAL_SOURCE_EXIT ) { - app_bsp_cleanup(); - } - - /* All done. Hang out. */ - BSP_ask_for_reset(); -} diff --git a/bsps/powerpc/virtex4/start/bspstart.c b/bsps/powerpc/virtex4/start/bspstart.c index 3597c9a359..58cd971647 100644 --- a/bsps/powerpc/virtex4/start/bspstart.c +++ b/bsps/powerpc/virtex4/start/bspstart.c @@ -119,14 +119,6 @@ static void __bsp_outchar_to_memory(char c) *msgBuffer = 0x00; /* Overwrite next location to show EOM */ } - -void BSP_ask_for_reset(void) -{ - printk("\nSystem stopped, issue RESET"); - - for(;;); -} - uint32_t _CPU_Counter_frequency(void) { return bsp_clicks_per_usec * 1000000; diff --git a/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml b/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml index abd1445345..191b5e4e4d 100644 --- a/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml +++ b/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml @@ -58,13 +58,13 @@ source: - bsps/powerpc/shared/start/memcpy.c - bsps/powerpc/shared/start/zerobss.c - bsps/powerpc/virtex4/irq/irq_init.c -- bsps/powerpc/virtex4/start/bspclean.c - bsps/powerpc/virtex4/start/bspstart.c - bsps/powerpc/virtex4/start/dummy_console.c - bsps/powerpc/virtex4/start/mmu.c - bsps/powerpc/virtex4/start/start.S - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/printk-dummy.c +- bsps/shared/start/bspfatal-default.c - bsps/shared/start/bspreset-loop.c - bsps/shared/start/gettargethash-default.c - bsps/shared/start/sbrk.c