diff --git a/bsps/arm/altera-cyclone-v/start/bspreset.c b/bsps/arm/altera-cyclone-v/start/bspreset.c
index 904d8f079b..a89dbaf9f5 100644
--- a/bsps/arm/altera-cyclone-v/start/bspreset.c
+++ b/bsps/arm/altera-cyclone-v/start/bspreset.c
@@ -34,7 +34,11 @@
 #include <bsp/bootcard.h>
 #include <bsp/alt_reset_manager.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   alt_reset_cold_reset();
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/arm/beagle/start/bspreset.c b/bsps/arm/beagle/start/bspreset.c
index 5865b7badf..d09e2eae27 100644
--- a/bsps/arm/beagle/start/bspreset.c
+++ b/bsps/arm/beagle/start/bspreset.c
@@ -21,7 +21,7 @@
 #define DM37XX_PRM_RSTCTRL_REG 0x250
 #define DM37XX_RST_DPLL3_BIT 2
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
 #if IS_DM3730
   static uint32_t reset_base = DM37XX_CM_BASE;
@@ -39,4 +39,7 @@ void bsp_reset(void)
              (1 << AM335X_RST_GLOBAL_WARM_SW_BIT));
   }
 #endif
+
+  (void) source;
+  (void) code;
 }
diff --git a/bsps/arm/csb337/start/bspreset.c b/bsps/arm/csb337/start/bspreset.c
index a4605dcaf3..7b59aa456d 100644
--- a/bsps/arm/csb337/start/bspreset.c
+++ b/bsps/arm/csb337/start/bspreset.c
@@ -16,10 +16,13 @@
 #include <at91rm9200_pmc.h>
 #include <at91rm9200_emac.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   rtems_interrupt_level level;
 
+  (void) source;
+  (void) code;
+
   rtems_interrupt_disable(level);
     (void) level; /* avoid set but not used warning */
 
diff --git a/bsps/arm/edb7312/start/bspreset.c b/bsps/arm/edb7312/start/bspreset.c
index 436bdf09e4..ba4a8b767d 100644
--- a/bsps/arm/edb7312/start/bspreset.c
+++ b/bsps/arm/edb7312/start/bspreset.c
@@ -10,8 +10,11 @@
 #include <bsp/bootcard.h>
 #include <ep7312.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
 #if ON_SKYEYE == 1
   #define SKYEYE_MAGIC_ADDRESS (*(volatile unsigned int *)(0xb0000000))
 
@@ -19,4 +22,5 @@ void bsp_reset(void)
 #else
   __asm__ volatile ("b _start");
 #endif
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/arm/fvp/start/bspreset.c b/bsps/arm/fvp/start/bspreset.c
index 514b1d056e..0cd955e018 100644
--- a/bsps/arm/fvp/start/bspreset.c
+++ b/bsps/arm/fvp/start/bspreset.c
@@ -40,8 +40,11 @@
 #include <bsp/bootcard.h>
 #include <bsp/semihosting.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   while ( true ) {
     (void) arm_fvp_semihosting_call( SYS_EXIT, ADP_Stopped_ApplicationExit );
   }
diff --git a/bsps/arm/gumstix/start/bspreset.c b/bsps/arm/gumstix/start/bspreset.c
index ab7c5ffc8f..bd175bc640 100644
--- a/bsps/arm/gumstix/start/bspreset.c
+++ b/bsps/arm/gumstix/start/bspreset.c
@@ -10,9 +10,13 @@
 #include <bsp/bootcard.h>
 #include <pxa255.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
 #if ON_SKYEYE == 1
   SKYEYE_MAGIC_ADDRESS = 0xff;
 #endif
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/arm/imx/start/bspreset.c b/bsps/arm/imx/start/bspreset.c
index 31fe9d8811..5ae210cefe 100644
--- a/bsps/arm/imx/start/bspreset.c
+++ b/bsps/arm/imx/start/bspreset.c
@@ -29,10 +29,13 @@
 #include <bsp.h>
 #include <arm/freescale/imx/imx_wdogreg.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   volatile uint16_t *pcr;
 
+  (void) source;
+  (void) code;
+
   imx_uart_console_drain();
 
   pcr = (volatile uint16_t *) 0x30280000;
diff --git a/bsps/arm/lpc24xx/start/bspreset-armv4.c b/bsps/arm/lpc24xx/start/bspreset-armv4.c
index e05ef6ae8b..911df1b099 100644
--- a/bsps/arm/lpc24xx/start/bspreset-armv4.c
+++ b/bsps/arm/lpc24xx/start/bspreset-armv4.c
@@ -34,7 +34,6 @@
  */
 
 #include <rtems.h>
-#include <rtems/score/armv7m.h>
 
 #include <bsp/bootcard.h>
 #include <bsp/lpc24xx.h>
@@ -42,12 +41,16 @@
 
 #ifdef ARM_MULTILIB_ARCH_V4
 
-BSP_START_TEXT_SECTION __attribute__((flatten)) void bsp_reset(void)
+BSP_START_TEXT_SECTION __attribute__((flatten)) void
+bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   rtems_interrupt_level level;
 
-  (void) level;
+  (void) source;
+  (void) code;
+
   rtems_interrupt_disable(level);
+  (void) level;
 
   /* Trigger watchdog reset */
   WDCLKSEL = 0;
diff --git a/bsps/arm/lpc32xx/start/bspreset.c b/bsps/arm/lpc32xx/start/bspreset.c
index 26da2037c5..fc17be0e33 100644
--- a/bsps/arm/lpc32xx/start/bspreset.c
+++ b/bsps/arm/lpc32xx/start/bspreset.c
@@ -33,8 +33,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdbool.h>
-
 #include <bspopts.h>
 #include <bsp/bootcard.h>
 #include <bsp/lpc32xx.h>
@@ -51,8 +49,11 @@ static void watchdog_reset(void)
   #endif
 }
 
-void bsp_reset( void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   watchdog_reset();
 
   while (true) {
diff --git a/bsps/arm/raspberrypi/start/bspreset.c b/bsps/arm/raspberrypi/start/bspreset.c
index 98c28bea9d..7b145734af 100644
--- a/bsps/arm/raspberrypi/start/bspreset.c
+++ b/bsps/arm/raspberrypi/start/bspreset.c
@@ -9,12 +9,14 @@
 #include <bsp/bootcard.h>
 #include <bsp/raspberrypi.h>
 #include <bsp.h>
-#include <rtems.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   uint32_t rstc;
 
+  (void) source;
+  (void) code;
+
   BCM2835_REG(BCM2835_PM_WDOG) = BCM2835_PM_PASSWD_MAGIC | 20;
   rstc = BCM2835_REG(BCM2835_PM_RSTC);
   rstc &= ~BCM2835_PM_RSTC_WRCFG;
diff --git a/bsps/arm/realview-pbx-a9/start/bspreset.c b/bsps/arm/realview-pbx-a9/start/bspreset.c
index a00c382467..338a92853c 100644
--- a/bsps/arm/realview-pbx-a9/start/bspreset.c
+++ b/bsps/arm/realview-pbx-a9/start/bspreset.c
@@ -27,11 +27,14 @@
 
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   volatile uint32_t *sys_lock = (volatile uint32_t *) 0x10000020;
   volatile uint32_t *sys_resetctl = (volatile uint32_t *) 0x10000040;
 
+  (void) source;
+  (void) code;
+
   while (true) {
     *sys_lock = 0xa05f;
     *sys_resetctl = 0xf4;
diff --git a/bsps/arm/rtl22xx/start/bspreset.c b/bsps/arm/rtl22xx/start/bspreset.c
index 573b4a2aa8..d6b00bd52c 100644
--- a/bsps/arm/rtl22xx/start/bspreset.c
+++ b/bsps/arm/rtl22xx/start/bspreset.c
@@ -10,7 +10,7 @@
 #include <bsp/bootcard.h>
 #include <lpc22xx.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
 #if ON_SKYEYE == 1
   #define SKYEYE_MAGIC_ADDRESS (*(volatile unsigned int *)(0xb0000000))
@@ -19,8 +19,8 @@ void bsp_reset(void)
 #else
   rtems_interrupt_level level;
 
-  (void) level;
   rtems_interrupt_disable(level);
+  (void) level;
 
   #ifdef __thumb__
     int tmp;
@@ -34,4 +34,7 @@ void bsp_reset(void)
   #endif
   while(1);
 #endif
+
+  (void) source;
+  (void) code;
 }
diff --git a/bsps/arm/shared/start/bspreset-armv7m.c b/bsps/arm/shared/start/bspreset-armv7m.c
index 816334bd70..28ae59ceaa 100644
--- a/bsps/arm/shared/start/bspreset-armv7m.c
+++ b/bsps/arm/shared/start/bspreset-armv7m.c
@@ -33,10 +33,14 @@
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-BSP_START_TEXT_SECTION __attribute__((flatten)) void bsp_reset(void)
+BSP_START_TEXT_SECTION __attribute__((flatten)) void
+bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   rtems_interrupt_level level;
 
+  (void) source;
+  (void) code;
+
   rtems_interrupt_local_disable(level);
   (void) level;
 
diff --git a/bsps/arm/smdk2410/start/bspreset.c b/bsps/arm/smdk2410/start/bspreset.c
index 365a22f14f..8640ac6a7a 100644
--- a/bsps/arm/smdk2410/start/bspreset.c
+++ b/bsps/arm/smdk2410/start/bspreset.c
@@ -9,8 +9,11 @@
 #include <bsp.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
 #if ON_SKYEYE == 1
   #define SKYEYE_MAGIC_ADDRESS (*(volatile unsigned int *)(0xb0000000))
 
@@ -22,8 +25,8 @@ void bsp_reset(void)
    */
   rtems_interrupt_level level;
 
-  (void) level;
   rtems_interrupt_disable(level);
+  (void) level;
   /* disable mmu, invalide i-cache and call swi #4 */
   __asm__ volatile(""
     "mrc    p15,0,r0,c1,c0,0  \n"
@@ -48,4 +51,6 @@ void bsp_reset(void)
   );
   /* we should be back in bios now */
 #endif
+
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/arm/stm32f4/start/bspreset.c b/bsps/arm/stm32f4/start/bspreset.c
index 15b3fe1a91..88605dfc6a 100644
--- a/bsps/arm/stm32f4/start/bspreset.c
+++ b/bsps/arm/stm32f4/start/bspreset.c
@@ -10,12 +10,15 @@
 
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   rtems_interrupt_level level;
 
-  (void) level;
+  (void) source;
+  (void) code;
+
   rtems_interrupt_disable(level);
+  (void) level;
 
   while (1);
 }
diff --git a/bsps/arm/stm32h7/start/bspstarthooks.c b/bsps/arm/stm32h7/start/bspstarthooks.c
index ac0f712e31..1591cc36bb 100644
--- a/bsps/arm/stm32h7/start/bspstarthooks.c
+++ b/bsps/arm/stm32h7/start/bspstarthooks.c
@@ -57,7 +57,7 @@ void stm32h7_init_oscillator(void)
 
   status = HAL_RCC_OscConfig(&stm32h7_config_oscillator);
   if (status != HAL_OK) {
-    bsp_reset();
+    bsp_reset(RTEMS_FATAL_SOURCE_BSP, 0);
   }
 }
 
@@ -70,7 +70,7 @@ void stm32h7_init_clocks(void)
     stm32h7_config_flash_latency
   );
   if (status != HAL_OK) {
-    bsp_reset();
+    bsp_reset(RTEMS_FATAL_SOURCE_BSP, 0);
   }
 }
 
@@ -80,7 +80,7 @@ void stm32h7_init_peripheral_clocks(void)
 
   status = HAL_RCCEx_PeriphCLKConfig(&stm32h7_config_peripheral_clocks);
   if (status != HAL_OK) {
-    bsp_reset();
+    bsp_reset(RTEMS_FATAL_SOURCE_BSP, 0);
   }
 }
 
diff --git a/bsps/arm/tms570/start/bspreset.c b/bsps/arm/tms570/start/bspreset.c
index 67cf96c67c..fd7a854662 100644
--- a/bsps/arm/tms570/start/bspreset.c
+++ b/bsps/arm/tms570/start/bspreset.c
@@ -55,11 +55,14 @@ static void handle_esm_errors(uint32_t esm_irq_channel)
    }
 }
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
    rtems_interrupt_level level;
    uint32_t esm_irq_channel;
 
+   (void) source;
+   (void) code;
+
    rtems_interrupt_disable(level);
    (void) level;
 
@@ -73,4 +76,5 @@ void bsp_reset(void)
    /* Reset the board */
    /* write of value other than 1 cause system reset */
    TMS570_SYS1.SYSECR = TMS570_SYS1_SYSECR_RESET(2);
+   RTEMS_UNREACHABLE();
 }
diff --git a/bsps/arm/xilinx-zynq/start/bspreset.c b/bsps/arm/xilinx-zynq/start/bspreset.c
index b6cf09ba02..c2009aae48 100644
--- a/bsps/arm/xilinx-zynq/start/bspreset.c
+++ b/bsps/arm/xilinx-zynq/start/bspreset.c
@@ -37,13 +37,16 @@
 #include <bsp/bootcard.h>
 #include <dev/serial/zynq-uart-regs.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   volatile zynq_uart *regs =
     (volatile zynq_uart *) ZYNQ_UART_KERNEL_IO_BASE_ADDR;
   volatile uint32_t *slcr_unlock = (volatile uint32_t *) 0xf8000008;
   volatile uint32_t *pss_rst_ctrl = (volatile uint32_t *) 0xf8000200;
 
+  (void) source;
+  (void) code;
+
   zynq_uart_reset_tx_flush(regs);
 
   while (true) {
diff --git a/bsps/arm/xilinx-zynqmp-rpu/start/bspreset.c b/bsps/arm/xilinx-zynqmp-rpu/start/bspreset.c
index eecb4da838..6b1ee92b9e 100644
--- a/bsps/arm/xilinx-zynqmp-rpu/start/bspreset.c
+++ b/bsps/arm/xilinx-zynqmp-rpu/start/bspreset.c
@@ -33,8 +33,11 @@
 #include <bsp.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   zynqmp_debug_console_flush();
 
   while (true) {
diff --git a/bsps/arm/xilinx-zynqmp/start/bspreset.c b/bsps/arm/xilinx-zynqmp/start/bspreset.c
index b43b19b05f..f02b84de96 100644
--- a/bsps/arm/xilinx-zynqmp/start/bspreset.c
+++ b/bsps/arm/xilinx-zynqmp/start/bspreset.c
@@ -32,8 +32,11 @@
 
 #include <bsp.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   zynqmp_debug_console_flush();
 
   while (true) {
diff --git a/bsps/i386/pc386/console/i386-stub.c b/bsps/i386/pc386/console/i386-stub.c
index 4b237e0a34..e9fe4c7b8a 100644
--- a/bsps/i386/pc386/console/i386-stub.c
+++ b/bsps/i386/pc386/console/i386-stub.c
@@ -100,6 +100,7 @@
 #include <stdbool.h>
 
 #include <bsp.h>
+#include <bsp/bootcard.h>
 
 /*
  * Number of debug registers.
@@ -109,7 +110,6 @@
 /*
  * Prototypes we need to avoid warnings but not going into public space.
  */
-void bsp_reset(void);
 void breakpoint (void);
 void set_debug_traps(void);
 void set_mem_err(void);
@@ -1103,7 +1103,7 @@ handle_exception (int exceptionVector)
 
 	  /* kill the program */
 	case 'k':		/* do nothing */
-	  bsp_reset();
+	  bsp_reset(RTEMS_FATAL_SOURCE_BSP, 0);
 	  continue;
 
 	default:
diff --git a/bsps/i386/pc386/console/inch.c b/bsps/i386/pc386/console/inch.c
index f5d5079236..9dfe33083f 100644
--- a/bsps/i386/pc386/console/inch.c
+++ b/bsps/i386/pc386/console/inch.c
@@ -160,7 +160,7 @@ _IBMPC_scankey(char *outChar)
 
     case 0x53:
       if (ctrl_pressed && alt_pressed)
-        bsp_reset(); /* ctrl+alt+del -> reboot */
+        bsp_reset( RTEMS_FATAL_SOURCE_BSP, 0 ); /* ctrl+alt+del -> reboot */
       break;
 
     /*
diff --git a/bsps/i386/pc386/console/keyboard.c b/bsps/i386/pc386/console/keyboard.c
index 0c8991b829..fbee5c9cf5 100644
--- a/bsps/i386/pc386/console/keyboard.c
+++ b/bsps/i386/pc386/console/keyboard.c
@@ -128,11 +128,16 @@ static void_fn do_null, enter, show_ptregs, send_intr, lastcons, caps_toggle,
   num, hold, scroll_forw, scroll_back, caps_on, compose,
   SAK, decr_console, incr_console, spawn_console, bare_num;
 
+static void bsp_reset_wrapper(void)
+{
+  bsp_reset(RTEMS_FATAL_SOURCE_BSP, 0);
+}
+
 static void_fnp spec_fn_table[] = {
   do_null,  enter,    show_ptregs,  show_mem,
   show_state,  send_intr,  lastcons,  caps_toggle,
   num,    hold,    scroll_forw,  scroll_back,
-  bsp_reset,  caps_on,  compose,  SAK,
+  bsp_reset_wrapper,  caps_on,  compose,  SAK,
   decr_console,  incr_console,  spawn_console,  bare_num
 };
 
diff --git a/bsps/i386/pc386/start/bspreset.c b/bsps/i386/pc386/start/bspreset.c
index 93ebf23f82..8df28806f6 100644
--- a/bsps/i386/pc386/start/bspreset.c
+++ b/bsps/i386/pc386/start/bspreset.c
@@ -26,12 +26,16 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems.h>
-#include <bsp.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+#include <bsp.h>
+
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   /* shutdown and reboot */
   outport_byte(0x64, 0xFE);        /* use keyboard controller */
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/include/bsp/bootcard.h b/bsps/include/bsp/bootcard.h
index 5f339d65f8..3c715e6885 100644
--- a/bsps/include/bsp/bootcard.h
+++ b/bsps/include/bsp/bootcard.h
@@ -62,7 +62,7 @@ extern const char *bsp_boot_cmdline;
 
 void bsp_start(void);
 
-void bsp_reset(void);
+RTEMS_NO_RETURN void bsp_reset(rtems_fatal_source source, rtems_fatal_code code);
 
 /**
  * @brief Standard system initialization procedure.
diff --git a/bsps/lm32/milkymist/start/bspclean.c b/bsps/lm32/milkymist/start/bspclean.c
index b010292d06..723a2d1005 100644
--- a/bsps/lm32/milkymist/start/bspclean.c
+++ b/bsps/lm32/milkymist/start/bspclean.c
@@ -48,14 +48,12 @@ static void reconf(void)
   icap_write(0, 0xffff); /* dummy word */
 }
 
-void bsp_fatal_extension(
-  rtems_fatal_source source,
-  bool always_set_to_false,
-  rtems_fatal_code error
-)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
-  if (source == RTEMS_FATAL_SOURCE_EXIT && error)
+  if (source == RTEMS_FATAL_SOURCE_EXIT && code)
     reconf();
   else
     reboot();
+
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/lm32/shared/start/bspreset.c b/bsps/lm32/shared/start/bspreset.c
index 16bc6b238d..42f10fe3cd 100644
--- a/bsps/lm32/shared/start/bspreset.c
+++ b/bsps/lm32/shared/start/bspreset.c
@@ -32,11 +32,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <bsp.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   /*
    * If on the GDB simulator, trap to it and exit.
    */
@@ -44,4 +46,6 @@ void bsp_reset( void )
      __asm__ volatile ( "mvi     r8, 1" );  /* 1 is SYS_exit */
      __asm__ volatile ( "scall" );
   #endif
+
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/m68k/mvme147/start/bspclean.c b/bsps/m68k/mvme147/start/bspclean.c
index dc08532e42..ef80cbc6dc 100644
--- a/bsps/m68k/mvme147/start/bspclean.c
+++ b/bsps/m68k/mvme147/start/bspclean.c
@@ -54,15 +54,15 @@ static rtems_isr bsp_return_to_monitor_trap(
   __asm__ volatile ( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) );
 }
 
-void bsp_fatal_extension(
-  rtems_fatal_source source,
-  bool always_set_to_false,
-  rtems_fatal_code error
-)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
    pcc->timer1_int_control = 0; /* Disable Timer 1 */
    pcc->timer2_int_control = 0; /* Disable Timer 2 */
 
    M68Kvec[ 45 ] = bsp_return_to_monitor_trap;   /* install handler */
    __asm__ volatile( "trap #13" );               /* ensures SUPV mode */
+   RTEMS_UNREACHABLE();
 }
diff --git a/bsps/m68k/mvme162/start/bspclean.c b/bsps/m68k/mvme162/start/bspclean.c
index dd91f96b1a..bd0ba27664 100644
--- a/bsps/m68k/mvme162/start/bspclean.c
+++ b/bsps/m68k/mvme162/start/bspclean.c
@@ -36,12 +36,12 @@ static rtems_isr bsp_return_to_monitor_trap(
   __asm__ volatile( ".short 0x63" );    /* return to 162Bug (.RETURN) */
 }
 
-void bsp_fatal_extension(
-  rtems_fatal_source source,
-  bool always_set_to_false,
-  rtems_fatal_code error
-)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
    M68Kvec[ 45 ] = bsp_return_to_monitor_trap;   /* install handler */
    __asm__ volatile( "trap #13" );               /* ensures SUPV mode */
+   RTEMS_UNREACHABLE();
 }
diff --git a/bsps/m68k/mvme167/start/bspclean.c b/bsps/m68k/mvme167/start/bspclean.c
index 2dd980fdb4..9b2c28ae9f 100644
--- a/bsps/m68k/mvme167/start/bspclean.c
+++ b/bsps/m68k/mvme167/start/bspclean.c
@@ -59,12 +59,12 @@ static void bsp_return_to_monitor_trap( void )
  *  167Bug because trap 13 is documented as being reserved for the internal
  *  use of the debugger.
  */
-void bsp_fatal_extension(
-  rtems_fatal_source source,
-  bool always_set_to_false,
-  rtems_fatal_code error
-)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
    M68Kvec[ 45 ] = bsp_return_to_monitor_trap;
    __asm__ volatile( "trap #13" );
+   RTEMS_UNREACHABLE();
 }
diff --git a/bsps/m68k/uC5282/start/bspclean.c b/bsps/m68k/uC5282/start/bspclean.c
deleted file mode 100644
index 54e811cfe2..0000000000
--- a/bsps/m68k/uC5282/start/bspclean.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This routine returns control from RTEMS to the monitor.
- */
-
-/*
- * Copyright (c) 2005 Eric Norum <eric@norum.ca>
- *
- * COPYRIGHT (c) 2005.
- * 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 <bsp.h>
-#include <bsp/bootcard.h>
-
-void bsp_fatal_extension(
-  rtems_fatal_source source,
-  bool always_set_to_false,
-  rtems_fatal_code error
-)
-{
-  bsp_reset();
-}
diff --git a/bsps/m68k/uC5282/start/bspreset.c b/bsps/m68k/uC5282/start/bspreset.c
index eedfb9bb0c..005a580da7 100644
--- a/bsps/m68k/uC5282/start/bspreset.c
+++ b/bsps/m68k/uC5282/start/bspreset.c
@@ -30,7 +30,11 @@
 #include <bsp.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   bsp_sysReset(0);
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/microblaze/microblaze_fpga/start/bspreset.c b/bsps/microblaze/microblaze_fpga/start/bspreset.c
index 6a7455f522..13ed4d537a 100644
--- a/bsps/microblaze/microblaze_fpga/start/bspreset.c
+++ b/bsps/microblaze/microblaze_fpga/start/bspreset.c
@@ -33,12 +33,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   __asm__ volatile (
     "brai 0xFFFFFFFFFFFFFFFF"
   );
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/mips/csb350/start/bspreset.c b/bsps/mips/csb350/start/bspreset.c
index 2d8af6cfdc..bb4e8220a3 100644
--- a/bsps/mips/csb350/start/bspreset.c
+++ b/bsps/mips/csb350/start/bspreset.c
@@ -26,18 +26,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems.h>
 #include <bsp/bootcard.h>
 #include <libcpu/au1x00.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   void (*reset_func)(void);
 
+  (void) source;
+  (void) code;
+
   reset_func = (void *)0xbfc00000;
 
   mips_set_sr( 0x00200000 ); /* all interrupts off, boot exception vectors */
 
   /* Try to restart bootloader */
   reset_func();
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/mips/malta/start/bspreset.c b/bsps/mips/malta/start/bspreset.c
index 02a48ba1f4..343fd7c895 100644
--- a/bsps/mips/malta/start/bspreset.c
+++ b/bsps/mips/malta/start/bspreset.c
@@ -32,13 +32,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   uint32_t *reset;
 
+  (void) source;
+  (void) code;
+
   reset= (uint32_t *)0x9F000500;
   /*
    * Qemu understands 0x42 to reset simulated machine.
@@ -50,4 +52,5 @@ void bsp_reset(void)
    */
   // *reset = 0x42;
   *reset = 0xFF;
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/powerpc/beatnik/include/bsp.h b/bsps/powerpc/beatnik/include/bsp.h
index a70bb3997f..972ad6abca 100644
--- a/bsps/powerpc/beatnik/include/bsp.h
+++ b/bsps/powerpc/beatnik/include/bsp.h
@@ -251,7 +251,6 @@ extern char *BSP_commandline_string;
 #define BSP_Convert_decrementer( _value ) \
   ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
 
-extern void bsp_reset(void);
 extern int BSP_disconnect_clock_handler (void);
 extern int BSP_connect_clock_handler (void);
 
diff --git a/bsps/powerpc/beatnik/start/bspreset.c b/bsps/powerpc/beatnik/start/bspreset.c
index 68540847ee..08a08f8133 100644
--- a/bsps/powerpc/beatnik/start/bspreset.c
+++ b/bsps/powerpc/beatnik/start/bspreset.c
@@ -3,16 +3,14 @@
 #include <bsp/bootcard.h>
 #include <rtems/bspIo.h>
 #include <libcpu/io.h>
-#include <libcpu/stackTrace.h>
 #include <stdint.h>
 
-void bsp_reset()
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
 
-  printk("Printing a stack trace for your convenience :-)\n");
-  CPU_print_stack();
-
-  printk("RTEMS terminated; Rebooting ...\n");
   /* Mvme5500 board reset : 2004 S. Kate Feng <feng1@bnl.gov>  */
   out_8((volatile uint8_t*) (BSP_MV64x60_DEV1_BASE +2), 0x80);
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/powerpc/gen5200/start/bspreset.c b/bsps/powerpc/gen5200/start/bspreset.c
index 77bd3b5047..bd347f45ec 100644
--- a/bsps/powerpc/gen5200/start/bspreset.c
+++ b/bsps/powerpc/gen5200/start/bspreset.c
@@ -31,8 +31,11 @@
 #include <bsp/mpc5200.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   #if (BENCHMARK_IRQ_PROCESSING == 1)
   {
     BSP_IRQ_Benchmarking_Report();
diff --git a/bsps/powerpc/gen83xx/start/bspreset.c b/bsps/powerpc/gen83xx/start/bspreset.c
index 83255e9eb9..42d6a978c2 100644
--- a/bsps/powerpc/gen83xx/start/bspreset.c
+++ b/bsps/powerpc/gen83xx/start/bspreset.c
@@ -24,12 +24,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <bsp.h>
 #include <bsp/bootcard.h>
 
 #include <mpc83xx/mpc83xx.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   mpc83xx_reset();
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/powerpc/motorola_powerpc/start/bspreset.c b/bsps/powerpc/motorola_powerpc/start/bspreset.c
index d0af42284f..88e9792b76 100644
--- a/bsps/powerpc/motorola_powerpc/start/bspreset.c
+++ b/bsps/powerpc/motorola_powerpc/start/bspreset.c
@@ -10,8 +10,12 @@
 |        Arguments: None.
 |          Returns: Nothing.
 +--------------------------------------------------------------------------*/
-void bsp_reset(void)
+
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   printk("Printing a stack trace for your convenience :-)\n");
   CPU_print_stack();
   /* shutdown and reboot */
@@ -25,4 +29,5 @@ void bsp_reset(void)
    outb(1, 0x92);
 
 #endif
+   RTEMS_UNREACHABLE();
 } /* bsp_reset */
diff --git a/bsps/powerpc/mpc55xxevb/start/bspreset.c b/bsps/powerpc/mpc55xxevb/start/bspreset.c
index 3cab952b3f..99a6ae39ab 100644
--- a/bsps/powerpc/mpc55xxevb/start/bspreset.c
+++ b/bsps/powerpc/mpc55xxevb/start/bspreset.c
@@ -39,8 +39,11 @@
 
 #include <mpc55xx/regs.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   while (true) {
     #if MPC55XX_CHIP_FAMILY == 564
       /* TODO */
diff --git a/bsps/powerpc/mvme3100/start/misc.c b/bsps/powerpc/mvme3100/start/misc.c
index 3a15397480..dbcf25df2f 100644
--- a/bsps/powerpc/mvme3100/start/misc.c
+++ b/bsps/powerpc/mvme3100/start/misc.c
@@ -49,10 +49,14 @@
 #include <bsp.h>
 #include <bsp/bootcard.h>
 
-void
-bsp_reset(void)
+
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
 uint8_t v;
+
+	(void) source;
+	(void) code;
+
 	/*
 	 * AFAIK, the hardest reset available; cleared
 	 * some errors a VME-bus reset wouldn't (hung
@@ -62,6 +66,7 @@ uint8_t v;
 	v &= ~BSP_MVME3100_SYS_CR_RESET_MSK;
 	v |=  BSP_MVME3100_SYS_CR_RESET;
 	out_8( BSP_MVME3100_SYS_CR, v );
+	RTEMS_UNREACHABLE();
 }
 
 uint8_t
diff --git a/bsps/powerpc/mvme5500/include/bsp.h b/bsps/powerpc/mvme5500/include/bsp.h
index bbc113cd7e..c63b77007f 100644
--- a/bsps/powerpc/mvme5500/include/bsp.h
+++ b/bsps/powerpc/mvme5500/include/bsp.h
@@ -154,7 +154,6 @@ extern unsigned int BSP_time_base_divisor;
 #define BSP_Convert_decrementer( _value ) \
   ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
 
-extern void bsp_reset(void);
 /* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */
 extern int BSP_disconnect_clock_handler(void);
 extern int BSP_connect_clock_handler(void);
diff --git a/bsps/powerpc/mvme5500/start/bspreset.c b/bsps/powerpc/mvme5500/start/bspreset.c
index de15bc4972..a41563005e 100644
--- a/bsps/powerpc/mvme5500/start/bspreset.c
+++ b/bsps/powerpc/mvme5500/start/bspreset.c
@@ -7,16 +7,14 @@
 #include <bsp/bootcard.h>
 #include <rtems/bspIo.h>
 #include <libcpu/io.h>
-#include <libcpu/stackTrace.h>
 #include <stdint.h>
 
-void bsp_reset()
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
 
-  printk("Printing a stack trace for your convenience :-)\n");
-  CPU_print_stack();
-
-  printk("RTEMS terminated; Rebooting ...\n");
   /* Mvme5500 board reset : 2004 S. Kate Feng <feng1@bnl.gov>  */
   out_8((volatile uint8_t*) (GT64x60_DEV1_BASE +2), 0x80);
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/powerpc/mvme5500/start/exceptionhandler.c b/bsps/powerpc/mvme5500/start/exceptionhandler.c
index be5f78f2d3..f76ad0ccd4 100644
--- a/bsps/powerpc/mvme5500/start/exceptionhandler.c
+++ b/bsps/powerpc/mvme5500/start/exceptionhandler.c
@@ -215,7 +215,7 @@ int			quiet=0;
 			rtems_task_suspend(id);
 		} else {
 			printk("PANIC, rebooting...\n");
-			bsp_reset();
+			bsp_reset(RTEMS_FATAL_SOURCE_BSP, 0);
 		}
     }
 }
diff --git a/bsps/powerpc/qoriq/start/bspreset.c b/bsps/powerpc/qoriq/start/bspreset.c
index 18ba66d9e9..b9293c57b5 100644
--- a/bsps/powerpc/qoriq/start/bspreset.c
+++ b/bsps/powerpc/qoriq/start/bspreset.c
@@ -44,11 +44,14 @@ static int find_rstcr_node(const void *fdt, int node)
   return fdt_node_offset_by_prop_value(fdt, node, "fsl,has-rstcr", NULL, 0);
 }
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   rtems_interrupt_level level;
   const char *fdt;
 
+  (void) source;
+  (void) code;
+
   rtems_interrupt_local_disable(level);
   (void) level;
 
diff --git a/bsps/powerpc/t32mppc/start/bspreset.c b/bsps/powerpc/t32mppc/start/bspreset.c
deleted file mode 100644
index 5ba20c6195..0000000000
--- a/bsps/powerpc/t32mppc/start/bspreset.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-
-/*
- * Copyright (c) 2012 embedded brains GmbH & Co. KG
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdbool.h>
-
-#include <bsp/bootcard.h>
-
-void bsp_reset(void)
-{
-  while (true) {
-    /* Do nothing */
-  }
-}
diff --git a/bsps/shared/start/bspfatal-default.c b/bsps/shared/start/bspfatal-default.c
index 88fdf39e71..411cf1d81d 100644
--- a/bsps/shared/start/bspfatal-default.c
+++ b/bsps/shared/start/bspfatal-default.c
@@ -220,6 +220,6 @@ void bsp_fatal_extension(
    *  you must have meant to reset the board.
    */
   #if (BSP_PRESS_KEY_FOR_RESET) || (BSP_RESET_BOARD_AT_EXIT)
-    bsp_reset();
+    bsp_reset( source, code );
   #endif
 }
diff --git a/bsps/shared/start/bspreset-arm-psci.c b/bsps/shared/start/bspreset-arm-psci.c
index 215be5c9b5..1827df6edc 100644
--- a/bsps/shared/start/bspreset-arm-psci.c
+++ b/bsps/shared/start/bspreset-arm-psci.c
@@ -37,9 +37,11 @@
 #include <bsp.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
 	uint32_t PSCI_FN_SYSTEM_RESET = 0x84000009;
+	(void) source;
+	(void) code;
 	__asm__ volatile(
 #if defined(AARCH64_MULTILIB_ARCH_V8) || defined(AARCH64_MULTILIB_ARCH_V8_ILP32)
 		"mov x0, %0\n"
@@ -53,4 +55,5 @@ void bsp_reset(void)
 #endif
 		: : "r" (PSCI_FN_SYSTEM_RESET)
 	);
+	RTEMS_UNREACHABLE();
 }
diff --git a/bsps/shared/start/bspreset-empty.c b/bsps/shared/start/bspreset-empty.c
deleted file mode 100644
index a23635697c..0000000000
--- a/bsps/shared/start/bspreset-empty.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-
-/*
- *  This is a dummy bsp_reset routine.
- *
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <rtems.h>
-#include <bsp/bootcard.h>
-
-void bsp_reset( void )
-{
-}
diff --git a/bsps/shared/start/bspreset-loop.c b/bsps/shared/start/bspreset-loop.c
index f4fb3009f5..f680674b0c 100644
--- a/bsps/shared/start/bspreset-loop.c
+++ b/bsps/shared/start/bspreset-loop.c
@@ -26,11 +26,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems.h>
 #include <bsp/bootcard.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   while (1)
     ;
 }
diff --git a/bsps/v850/gdbv850sim/start/bspreset.c b/bsps/v850/gdbv850sim/start/bspreset.c
index 96de0cbeae..42f7ba0049 100644
--- a/bsps/v850/gdbv850sim/start/bspreset.c
+++ b/bsps/v850/gdbv850sim/start/bspreset.c
@@ -32,11 +32,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems.h>
 #include <bsp/bootcard.h>
 #include <bsp/syscall.h>
 
-void bsp_reset( void )
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   TRAP0 (SYS_exit, 0, 0, 0);
+  RTEMS_UNREACHABLE();
 }
diff --git a/bsps/x86_64/amd64/start/bspreset.c b/bsps/x86_64/amd64/start/bspreset.c
index bc8a84f311..587e1c72c4 100644
--- a/bsps/x86_64/amd64/start/bspreset.c
+++ b/bsps/x86_64/amd64/start/bspreset.c
@@ -41,8 +41,11 @@
 #define KEYBOARD_CONTROLLER_PORT 0x64
 #define PULSE_RESET_LINE         0xFE
 
-void bsp_reset(void)
+void bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
+  (void) source;
+  (void) code;
+
   ACPI_STATUS status = AcpiEnterSleepStatePrep(ACPI_STATE_S5);
 
   if (status == AE_OK) {
@@ -52,4 +55,5 @@ void bsp_reset(void)
 
   /* Should be unreachable. As a fallback try the keyboard controller method */
   outport_byte(KEYBOARD_CONTROLLER_PORT, PULSE_RESET_LINE);
+  RTEMS_UNREACHABLE();
 }
diff --git a/cpukit/libdebugger/rtems-debugger-server.c b/cpukit/libdebugger/rtems-debugger-server.c
index 166a7bbf24..2ad8544a6f 100644
--- a/cpukit/libdebugger/rtems-debugger-server.c
+++ b/cpukit/libdebugger/rtems-debugger-server.c
@@ -45,11 +45,6 @@
  * GDB Debugger Remote Server for RTEMS.
  */
 
-/*
- * Hack to void including bsp.h. The reset needs a better API.
- */
-extern void bsp_reset(void);
-
 /*
  * Command lookup table.
  */
diff --git a/cpukit/libtest/testgcovbspreset.c b/cpukit/libtest/testgcovbspreset.c
index f40102c944..e6e1941bde 100644
--- a/cpukit/libtest/testgcovbspreset.c
+++ b/cpukit/libtest/testgcovbspreset.c
@@ -43,12 +43,12 @@
 
 #include <rtems/score/cpu.h>
 
-void __real_bsp_reset( void );
+void __real_bsp_reset( rtems_fatal_source source, rtems_fatal_code code );
 
-void __wrap_bsp_reset( void );
+void __wrap_bsp_reset( rtems_fatal_source source, rtems_fatal_code code );
 
-void __wrap_bsp_reset( void )
+void __wrap_bsp_reset( rtems_fatal_source source, rtems_fatal_code code )
 {
   rtems_test_gcov_dump_info();
-  __real_bsp_reset();
+  __real_bsp_reset( source, code );
 }
diff --git a/spec/build/bsps/arm/csb336/bspcsb336.yml b/spec/build/bsps/arm/csb336/bspcsb336.yml
index 7028925662..32f63d6e0a 100644
--- a/spec/build/bsps/arm/csb336/bspcsb336.yml
+++ b/spec/build/bsps/arm/csb336/bspcsb336.yml
@@ -53,7 +53,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/arm/xen/bspxen.yml b/spec/build/bsps/arm/xen/bspxen.yml
index fd5d519083..2fbd4a635a 100644
--- a/spec/build/bsps/arm/xen/bspxen.yml
+++ b/spec/build/bsps/arm/xen/bspxen.yml
@@ -79,7 +79,7 @@ source:
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/bfin/TLL6527M/bsptll6527m.yml b/spec/build/bsps/bfin/TLL6527M/bsptll6527m.yml
index 6df5a03184..02c910cd68 100644
--- a/spec/build/bsps/bfin/TLL6527M/bsptll6527m.yml
+++ b/spec/build/bsps/bfin/TLL6527M/bsptll6527m.yml
@@ -56,7 +56,7 @@ source:
 - bsps/bfin/shared/cache/cache.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/bfin/bf537Stamp/bspbf537stamp.yml b/spec/build/bsps/bfin/bf537Stamp/bspbf537stamp.yml
index 9685eac579..38bab0f9ec 100644
--- a/spec/build/bsps/bfin/bf537Stamp/bspbf537stamp.yml
+++ b/spec/build/bsps/bfin/bf537Stamp/bspbf537stamp.yml
@@ -49,7 +49,7 @@ source:
 - bsps/bfin/shared/interrupt.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/bfin/eZKit533/bspezkit533.yml b/spec/build/bsps/bfin/eZKit533/bspezkit533.yml
index f399231c6e..1338afb207 100644
--- a/spec/build/bsps/bfin/eZKit533/bspezkit533.yml
+++ b/spec/build/bsps/bfin/eZKit533/bspezkit533.yml
@@ -50,7 +50,7 @@ source:
 - bsps/bfin/shared/interrupt.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/lm32/milkymist/bspmilkymist.yml b/spec/build/bsps/lm32/milkymist/bspmilkymist.yml
index 299c57e4a0..68c8685015 100644
--- a/spec/build/bsps/lm32/milkymist/bspmilkymist.yml
+++ b/spec/build/bsps/lm32/milkymist/bspmilkymist.yml
@@ -60,7 +60,7 @@ source:
 - bsps/lm32/shared/start/bspstart.c
 - bsps/shared/cache/nocache.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspfatal-default.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/m68k/csb360/bspcsb360.yml b/spec/build/bsps/m68k/csb360/bspcsb360.yml
index 3dd83936b7..44e08e6eed 100644
--- a/spec/build/bsps/m68k/csb360/bspcsb360.yml
+++ b/spec/build/bsps/m68k/csb360/bspcsb360.yml
@@ -48,7 +48,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-polled.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/m68k/gen68340/bspgen68340.yml b/spec/build/bsps/m68k/gen68340/bspgen68340.yml
index e200e89ab2..dce69e5abd 100644
--- a/spec/build/bsps/m68k/gen68340/bspgen68340.yml
+++ b/spec/build/bsps/m68k/gen68340/bspgen68340.yml
@@ -54,7 +54,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/m68k/gen68360/obj.yml b/spec/build/bsps/m68k/gen68360/obj.yml
index 18b469cfe7..b3d1ee1734 100644
--- a/spec/build/bsps/m68k/gen68360/obj.yml
+++ b/spec/build/bsps/m68k/gen68360/obj.yml
@@ -32,7 +32,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/m68k/mcf5206elite/bspmcf5206elite.yml b/spec/build/bsps/m68k/mcf5206elite/bspmcf5206elite.yml
index 4b77125814..e576bdd1d7 100644
--- a/spec/build/bsps/m68k/mcf5206elite/bspmcf5206elite.yml
+++ b/spec/build/bsps/m68k/mcf5206elite/bspmcf5206elite.yml
@@ -64,7 +64,7 @@ source:
 - bsps/shared/dev/rtc/rtc-support.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/m68k/mrm332/bspmrm332.yml b/spec/build/bsps/m68k/mrm332/bspmrm332.yml
index 5edcf1cf20..ba8fc9bd29 100644
--- a/spec/build/bsps/m68k/mrm332/bspmrm332.yml
+++ b/spec/build/bsps/m68k/mrm332/bspmrm332.yml
@@ -52,7 +52,7 @@ source:
 - bsps/m68k/shared/memProbe.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/m68k/mvme147/bspmvme147.yml b/spec/build/bsps/m68k/mvme147/bspmvme147.yml
index 179bedc483..1aeaae5b48 100644
--- a/spec/build/bsps/m68k/mvme147/bspmvme147.yml
+++ b/spec/build/bsps/m68k/mvme147/bspmvme147.yml
@@ -49,7 +49,7 @@ source:
 - bsps/m68k/shared/memProbe.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspfatal-default.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/m68k/mvme147s/bspmvme147s.yml b/spec/build/bsps/m68k/mvme147s/bspmvme147s.yml
index 886c567af2..ea9e0d2b75 100644
--- a/spec/build/bsps/m68k/mvme147s/bspmvme147s.yml
+++ b/spec/build/bsps/m68k/mvme147s/bspmvme147s.yml
@@ -51,7 +51,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/m68k/mvme162/obj.yml b/spec/build/bsps/m68k/mvme162/obj.yml
index bf3736b2b7..6f6449d95f 100644
--- a/spec/build/bsps/m68k/mvme162/obj.yml
+++ b/spec/build/bsps/m68k/mvme162/obj.yml
@@ -26,14 +26,14 @@ source:
 - bsps/m68k/mvme162/clock/ckinit.c
 - bsps/m68k/mvme162/console/console.c
 - bsps/m68k/mvme162/rtc/tod.c
-- bsps/m68k/mvme162/start/bspclean.c
 - bsps/m68k/mvme162/start/bspstart.c
+- bsps/m68k/mvme162/start/bspclean.c
 - bsps/m68k/mvme162/start/page_table.c
 - bsps/m68k/shared/cache/cache.c
 - bsps/m68k/shared/m68kidle.c
 - bsps/m68k/shared/memProbe.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspfatal-default.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/m68k/mvme167/bspmvme167.yml b/spec/build/bsps/m68k/mvme167/bspmvme167.yml
index d914296305..ac1d5e55f5 100644
--- a/spec/build/bsps/m68k/mvme167/bspmvme167.yml
+++ b/spec/build/bsps/m68k/mvme167/bspmvme167.yml
@@ -64,7 +64,7 @@ source:
 - bsps/m68k/shared/m68kidle.c
 - bsps/m68k/shared/memProbe.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspfatal-default.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/m68k/uC5282/bspuc5282.yml b/spec/build/bsps/m68k/uC5282/bspuc5282.yml
index 1218875f62..d11145a1c8 100644
--- a/spec/build/bsps/m68k/uC5282/bspuc5282.yml
+++ b/spec/build/bsps/m68k/uC5282/bspuc5282.yml
@@ -43,11 +43,11 @@ source:
 - bsps/m68k/uC5282/btimer/btimer.c
 - bsps/m68k/uC5282/clock/clock.c
 - bsps/m68k/uC5282/console/console.c
-- bsps/m68k/uC5282/start/bspclean.c
 - bsps/m68k/uC5282/start/bspreset.c
 - bsps/m68k/uC5282/start/bspstart.c
 - bsps/m68k/uC5282/start/init5282.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
+- bsps/shared/start/bspfatal-default.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/setvec.c
diff --git a/spec/build/bsps/mips/hurricane/bsphurricane.yml b/spec/build/bsps/mips/hurricane/bsphurricane.yml
index 04ae0658f4..687efeaefb 100644
--- a/spec/build/bsps/mips/hurricane/bsphurricane.yml
+++ b/spec/build/bsps/mips/hurricane/bsphurricane.yml
@@ -65,7 +65,7 @@ source:
 - bsps/shared/cache/nocache.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/mips/rbtx4925/bsprbtx4925.yml b/spec/build/bsps/mips/rbtx4925/bsprbtx4925.yml
index 3c21889f5f..14f13dcaee 100644
--- a/spec/build/bsps/mips/rbtx4925/bsprbtx4925.yml
+++ b/spec/build/bsps/mips/rbtx4925/bsprbtx4925.yml
@@ -61,7 +61,7 @@ source:
 - bsps/shared/cache/nocache.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/mips/rbtx4938/bsprbtx4938.yml b/spec/build/bsps/mips/rbtx4938/bsprbtx4938.yml
index af56bce558..b7a24ac527 100644
--- a/spec/build/bsps/mips/rbtx4938/bsprbtx4938.yml
+++ b/spec/build/bsps/mips/rbtx4938/bsprbtx4938.yml
@@ -59,7 +59,7 @@ source:
 - bsps/shared/cache/nocache.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml b/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml
index b2182a25a9..6aa17568c1 100644
--- a/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml
+++ b/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml
@@ -47,7 +47,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-polled.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml b/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml
index 1c2a282ae2..8cd5ec91f1 100644
--- a/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml
+++ b/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml
@@ -59,7 +59,7 @@ source:
 - bsps/shared/dev/serial/legacy-console-select.c
 - bsps/shared/dev/serial/legacy-console.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/stackalloc.c
diff --git a/spec/build/bsps/powerpc/mpc8260ads/bspmpc8260ads.yml b/spec/build/bsps/powerpc/mpc8260ads/bspmpc8260ads.yml
index 0a91d435c9..d690091f7b 100644
--- a/spec/build/bsps/powerpc/mpc8260ads/bspmpc8260ads.yml
+++ b/spec/build/bsps/powerpc/mpc8260ads/bspmpc8260ads.yml
@@ -71,7 +71,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/powerpc/psim/bsppsim.yml b/spec/build/bsps/powerpc/psim/bsppsim.yml
index c183cf15cd..253e9411c4 100644
--- a/spec/build/bsps/powerpc/psim/bsppsim.yml
+++ b/spec/build/bsps/powerpc/psim/bsppsim.yml
@@ -81,6 +81,6 @@ source:
 - bsps/shared/dev/serial/console-polled.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 type: build
diff --git a/spec/build/bsps/powerpc/qemuppc/bspqemuppc.yml b/spec/build/bsps/powerpc/qemuppc/bspqemuppc.yml
index d7897401bf..d36e916fe4 100644
--- a/spec/build/bsps/powerpc/qemuppc/bspqemuppc.yml
+++ b/spec/build/bsps/powerpc/qemuppc/bspqemuppc.yml
@@ -60,7 +60,7 @@ source:
 - bsps/shared/dev/serial/console-polled.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/powerpc/ss555/bspss555.yml b/spec/build/bsps/powerpc/ss555/bspss555.yml
index d496aa4c20..f59959ebca 100644
--- a/spec/build/bsps/powerpc/ss555/bspss555.yml
+++ b/spec/build/bsps/powerpc/ss555/bspss555.yml
@@ -85,7 +85,7 @@ source:
 - bsps/shared/irq/irq-server.c
 - bsps/shared/irq/irq-shell.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml b/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml
index 78ac333ea7..3034b0bf31 100644
--- a/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml
+++ b/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml
@@ -59,13 +59,13 @@ source:
 - bsps/powerpc/t32mppc/clock/clock-config.c
 - bsps/powerpc/t32mppc/console/console.c
 - bsps/powerpc/t32mppc/irq/irq.c
-- bsps/powerpc/t32mppc/start/bspreset.c
 - bsps/powerpc/t32mppc/start/bspstart.c
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/powerpc/tqm8xx/obj.yml b/spec/build/bsps/powerpc/tqm8xx/obj.yml
index e244eecfb9..28c0d823c1 100644
--- a/spec/build/bsps/powerpc/tqm8xx/obj.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/obj.yml
@@ -43,7 +43,7 @@ source:
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/mallocinitone.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml b/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml
index e585a2d366..abd1445345 100644
--- a/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml
+++ b/spec/build/bsps/powerpc/virtex4/bspvirtex4.yml
@@ -65,7 +65,7 @@ source:
 - bsps/powerpc/virtex4/start/start.S
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/powerpc/virtex5/bspvirtex5.yml b/spec/build/bsps/powerpc/virtex5/bspvirtex5.yml
index 3c98e7a9fe..626db537b6 100644
--- a/spec/build/bsps/powerpc/virtex5/bspvirtex5.yml
+++ b/spec/build/bsps/powerpc/virtex5/bspvirtex5.yml
@@ -66,7 +66,7 @@ source:
 - bsps/powerpc/virtex5/start/start.S
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/riscv/griscv/obj.yml b/spec/build/bsps/riscv/griscv/obj.yml
index 275aa09256..1abadb8599 100644
--- a/spec/build/bsps/riscv/griscv/obj.yml
+++ b/spec/build/bsps/riscv/griscv/obj.yml
@@ -30,6 +30,6 @@ source:
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 type: build
diff --git a/spec/build/bsps/riscv/noel/obj.yml b/spec/build/bsps/riscv/noel/obj.yml
index 0d91856741..b00d5a6902 100644
--- a/spec/build/bsps/riscv/noel/obj.yml
+++ b/spec/build/bsps/riscv/noel/obj.yml
@@ -31,7 +31,7 @@ source:
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bsp-fdt.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/grlib/uart/apbuart_polled.c
 - bsps/shared/grlib/uart/apbuart_termios.c
diff --git a/spec/build/bsps/riscv/riscv/obj.yml b/spec/build/bsps/riscv/riscv/obj.yml
index b9ad7e95a9..3460fd9c98 100644
--- a/spec/build/bsps/riscv/riscv/obj.yml
+++ b/spec/build/bsps/riscv/riscv/obj.yml
@@ -37,6 +37,6 @@ source:
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bsp-fdt.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 type: build
diff --git a/spec/build/bsps/sh/gensh2/bspgensh2.yml b/spec/build/bsps/sh/gensh2/bspgensh2.yml
index 7fb181172e..fdb5c3e18b 100644
--- a/spec/build/bsps/sh/gensh2/bspgensh2.yml
+++ b/spec/build/bsps/sh/gensh2/bspgensh2.yml
@@ -72,7 +72,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/sh/gensh4/bspgensh4.yml b/spec/build/bsps/sh/gensh4/bspgensh4.yml
index f60abe7541..8edc9d257d 100644
--- a/spec/build/bsps/sh/gensh4/bspgensh4.yml
+++ b/spec/build/bsps/sh/gensh4/bspgensh4.yml
@@ -67,7 +67,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/sh/shsim/obj.yml b/spec/build/bsps/sh/shsim/obj.yml
index 70557d0514..86b0d43a16 100644
--- a/spec/build/bsps/sh/shsim/obj.yml
+++ b/spec/build/bsps/sh/shsim/obj.yml
@@ -34,7 +34,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-polled.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 type: build
diff --git a/spec/build/bsps/sparc/erc32/bsperc32.yml b/spec/build/bsps/sparc/erc32/bsperc32.yml
index 4d57e5902d..48188fed0b 100644
--- a/spec/build/bsps/sparc/erc32/bsperc32.yml
+++ b/spec/build/bsps/sparc/erc32/bsperc32.yml
@@ -52,7 +52,7 @@ source:
 - bsps/shared/dev/serial/legacy-console.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/sparc/erc32/btimer/btimer.c
diff --git a/spec/build/bsps/sparc/leon2/obj.yml b/spec/build/bsps/sparc/leon2/obj.yml
index 5a68f896ed..23f2136aba 100644
--- a/spec/build/bsps/sparc/leon2/obj.yml
+++ b/spec/build/bsps/sparc/leon2/obj.yml
@@ -28,7 +28,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/sparc/leon2/btimer/btimer.c
diff --git a/spec/build/bsps/sparc/leon3/obj.yml b/spec/build/bsps/sparc/leon3/obj.yml
index f8feab3b3b..2051d21d01 100644
--- a/spec/build/bsps/sparc/leon3/obj.yml
+++ b/spec/build/bsps/sparc/leon3/obj.yml
@@ -35,7 +35,7 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/sbrk.c
 - bsps/sparc/leon3/btimer/btimer.c
 - bsps/sparc/leon3/btimer/watchdog.c
diff --git a/spec/build/bsps/sparc64/niagara/bspniagara.yml b/spec/build/bsps/sparc64/niagara/bspniagara.yml
index 012f765d3c..b7731387c3 100644
--- a/spec/build/bsps/sparc64/niagara/bspniagara.yml
+++ b/spec/build/bsps/sparc64/niagara/bspniagara.yml
@@ -44,7 +44,7 @@ source:
 - bsps/shared/dev/serial/legacy-console-control.c
 - bsps/shared/dev/serial/legacy-console-select.c
 - bsps/shared/dev/serial/legacy-console.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/sparc64/usiii/bspusiii.yml b/spec/build/bsps/sparc64/usiii/bspusiii.yml
index 2f67a3e1f7..77c285ed72 100644
--- a/spec/build/bsps/sparc64/usiii/bspusiii.yml
+++ b/spec/build/bsps/sparc64/usiii/bspusiii.yml
@@ -47,7 +47,7 @@ source:
 - bsps/shared/dev/serial/legacy-console-select.c
 - bsps/shared/dev/serial/legacy-console.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspreset-empty.c
+- bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c