score: Add RTEMS_FATAL_SOURCE_BSP

Merge RTEMS_FATAL_SOURCE_BSP_GENERIC and RTEMS_FATAL_SOURCE_BSP_SPECIFIC
into new fatal source RTEMS_FATAL_SOURCE_BSP.  This makes it easier to
figure out the code position given a fatal source and code.

16 files changed, 44 insertions, 86 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c
index dee1ca10be..f16a958f78 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c
@@ -19,6 +19,7 @@
 #include <libcpu/powerpc-utility.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 typedef enum {
@@ -182,7 +183,7 @@ void ata_driver_dma_pio_single_create(ata_driver_dma_pio_single *self, const cha
       self
     );
     if (sc != RTEMS_SUCCESSFUL) {
-      mpc5200_fatal(MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL);
+      bsp_fatal(MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL);
     }
   }
 }
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c
index 60380a8008..20e8f26904 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c
@@ -13,6 +13,7 @@
  */
 
 #include <bsp/ata.h>
+#include <bsp/fatal.h>
 
 #include <libchip/ata.h>
 
@@ -33,7 +34,7 @@ rtems_status_code rtems_ata_initialize(
 
     ata_driver_dma_pio_single_create(&ata_driver_instance, "/dev/hda", TASK_PCI_TX);
   } else {
-    mpc5200_fatal(MPC5200_FATAL_ATA_DISK_IO_INIT);
+    bsp_fatal(MPC5200_FATAL_ATA_DISK_IO_INIT);
   }
 
   return sc;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
index 54a31d1473..5230f5d3e1 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
@@ -17,6 +17,7 @@
 #include <bsp/ata.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/mpc5200.h>
 
 #include <libcpu/powerpc-utility.h>
@@ -125,7 +126,7 @@ static void create_lock(ata_driver *self)
     &self->lock
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc5200_fatal(MPC5200_FATAL_ATA_LOCK_CREATE);
+    bsp_fatal(MPC5200_FATAL_ATA_LOCK_CREATE);
   }
 }
 
@@ -133,7 +134,7 @@ static void destroy_lock(const ata_driver *self)
 {
   rtems_status_code sc = rtems_semaphore_delete(self->lock);
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc5200_fatal(MPC5200_FATAL_ATA_LOCK_DESTROY);
+    bsp_fatal(MPC5200_FATAL_ATA_LOCK_DESTROY);
   }
 }
 
@@ -162,7 +163,7 @@ void ata_driver_create(ata_driver *self, const char *device_file_path, rtems_blo
         );
 
         if (sc != RTEMS_SUCCESSFUL) {
-          mpc5200_fatal(MPC5200_FATAL_ATA_DISK_CREATE);
+          bsp_fatal(MPC5200_FATAL_ATA_DISK_CREATE);
         }
       }
     }
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
index b8c46dc268..463417ac73 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
@@ -254,24 +254,6 @@ void BSP_IRQ_Benchmarking_Report(void);
 
 void cpu_init(void);
 
-typedef enum {
-  MPC5200_FATAL_PCF8563_INVALID_YEAR,
-  MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL,
-  MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL,
-  MPC5200_FATAL_TM27_IRQ_INSTALL,
-  MPC5200_FATAL_MSCAN_A_INIT,
-  MPC5200_FATAL_MSCAN_B_INIT,
-  MPC5200_FATAL_MSCAN_A_SET_MODE,
-  MPC5200_FATAL_MSCAN_B_SET_MODE,
-  MPC5200_FATAL_ATA_DISK_IO_INIT,
-  MPC5200_FATAL_ATA_DISK_CREATE,
-  MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL,
-  MPC5200_FATAL_ATA_LOCK_CREATE,
-  MPC5200_FATAL_ATA_LOCK_DESTROY
-} mpc5200_fatal_code;
-
-void mpc5200_fatal(mpc5200_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h b/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
index 612714cb9d..55ada2c66b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
@@ -17,6 +17,7 @@
 #ifndef __tm27_h
 #define __tm27_h
 
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 /*
@@ -37,7 +38,7 @@ void Install_tm27_vector(void (*_handler)())
   clockIrqData.hdl = _handler;
   if (!BSP_install_rtems_irq_handler (&clockIrqData)) {
         printk("Error installing clock interrupt handler!\n");
-        mpc5200_fatal(MPC5200_FATAL_TM27_IRQ_INSTALL);
+        bsp_fatal(MPC5200_FATAL_TM27_IRQ_INSTALL);
   }
 }
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
index 4be59503d0..3a804a3726 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "../include/bsp.h"
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 #include "../mscan/mscan_int.h"
 
@@ -770,20 +771,20 @@ rtems_device_driver mscan_initialize(rtems_device_major_number major,
 
   /* Initialization requested via RTEMS */
   if ((status = mscan_channel_initialize(major, MSCAN_A)) != RTEMS_SUCCESSFUL)
-    mpc5200_fatal(MPC5200_FATAL_MSCAN_A_INIT);
+    bsp_fatal(MPC5200_FATAL_MSCAN_A_INIT);
 
   if ((status = mscan_channel_initialize(major, MSCAN_B)) != RTEMS_SUCCESSFUL)
-    mpc5200_fatal(MPC5200_FATAL_MSCAN_B_INIT);
+    bsp_fatal(MPC5200_FATAL_MSCAN_B_INIT);
 
   if ((status =
        mpc5200_mscan_set_mode(MSCAN_A,
                               MSCAN_INIT_NORMAL_MODE)) != RTEMS_SUCCESSFUL)
-    mpc5200_fatal(MPC5200_FATAL_MSCAN_A_SET_MODE);
+    bsp_fatal(MPC5200_FATAL_MSCAN_A_SET_MODE);
 
   if ((status =
        mpc5200_mscan_set_mode(MSCAN_B,
                               MSCAN_INIT_NORMAL_MODE)) != RTEMS_SUCCESSFUL)
-    mpc5200_fatal(MPC5200_FATAL_MSCAN_B_SET_MODE);
+    bsp_fatal(MPC5200_FATAL_MSCAN_B_SET_MODE);
 
   return status;
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
index 8c54976de4..0c3bf0d38b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
@@ -99,6 +99,7 @@
 
 #include <bsp.h>
 #include <rtems/bspIo.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #include <rtems.h>
@@ -338,7 +339,7 @@ rtems_device_driver slt_initialize
       {
 
       printk("Unable to connect PSC Irq handler\n");
-      mpc5200_fatal(MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL);
+      bsp_fatal(MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL);
 
       }
 
@@ -353,7 +354,7 @@ rtems_device_driver slt_initialize
       {
 
       printk("Unable to connect PSC Irq handler\n");
-      mpc5200_fatal(MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL);
+      bsp_fatal(MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL);
 
       }
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
index 8324b44dc9..bea818042d 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
@@ -124,11 +124,6 @@ void _BSP_Fatal_error(unsigned int v)
   __asm__ __volatile ("sc");
 }
 
-void mpc5200_fatal(mpc5200_fatal_code code)
-{
-  rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
-}
-
 void bsp_start(void)
 {
   ppc_cpu_id_t myCpu;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c b/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c
index 2f38ea86fb..0b584a013b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c
@@ -41,6 +41,7 @@
  */
 
 #include <rtems.h>
+#include <bsp/fatal.h>
 #include <libchip/rtc.h>
 #include <string.h>
 #include "../tod/pcf8563.h"
@@ -185,7 +186,7 @@ pcf8563_set_time(int minor, const rtems_time_of_day *time)
     addr = RTC_Table[minor].ulDataPort;
 
     if ((time->year >= 2100) || (time->year <  1900)) {
-      mpc5200_fatal(MPC5200_FATAL_PCF8563_INVALID_YEAR);
+      bsp_fatal(MPC5200_FATAL_PCF8563_INVALID_YEAR);
     }
     info[0] = PCF8563_SECOND_ADR;
     info[1 + PCF8563_YEAR_ADR  -PCF8563_SECOND_ADR] = To_BCD(time->year % 100);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
index 48c592245b..69a45d33f8 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
@@ -21,6 +21,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #include <mpc55xx/regs.h>
@@ -53,7 +54,7 @@ static void mpc55xx_clock_handler_install(rtems_isr_entry isr)
     NULL
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL);
   }
 }
 
@@ -73,12 +74,12 @@ static void mpc55xx_clock_initialize(void)
   if (prescaler > 0) {
     interval /= (uint64_t) prescaler;
   } else {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER);
   }
 
   /* Check interval */
   if (interval == 0 || interval > MPC55XX_EMIOS_VALUE_MAX) {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL);
   }
 
   /* Configure eMIOS channel */
@@ -159,7 +160,7 @@ static void mpc55xx_clock_handler_install(rtems_isr_entry isr)
     NULL
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL);
   }
 }
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
index c54dd353fc..0620cda304 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
@@ -21,6 +21,7 @@
 #include <bsp/console-esci.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #ifdef MPC55XX_HAS_ESCI
@@ -268,12 +269,12 @@ static int mpc55xx_esci_first_open(int major, int minor, void *arg)
 
   rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_BAUD);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_BAUD);
   }
 
   rv = mpc55xx_esci_set_attributes(minor, &tty->termios);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES);
   }
 
   sc = mpc55xx_interrupt_handler_install(
@@ -285,7 +286,7 @@ static int mpc55xx_esci_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL);
   }
 
   mpc55xx_esci_interrupts_clear_and_enable(self);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
index 2f71948f74..14cb65ffbc 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
@@ -22,6 +22,7 @@
 
 #include <bsp.h>
 #include <bsp/console-generic.h>
+#include <bsp/fatal.h>
 
 #include <rtems/console.h>
 
@@ -80,7 +81,7 @@ rtems_device_driver console_initialize(
   rtems_device_minor_number console = console_generic_minor;
 
   if (count <= 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_COUNT);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_COUNT);
   }
 
   rtems_termios_initialize();
@@ -90,13 +91,13 @@ rtems_device_driver console_initialize(
 
     sc = rtems_io_register_name(info->device_path, major, minor);
     if (sc != RTEMS_SUCCESSFUL) {
-      mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER);
+      bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER);
     }
   }
 
   sc = rtems_io_register_name(CONSOLE_DEVICE_NAME, major, console);
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE);
   }
 
   console_generic_char_out_do_init();
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
index 20ffcf3d57..71be4dc424 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
@@ -21,6 +21,7 @@
 #include <bsp/console-linflex.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #ifdef MPC55XX_HAS_LINFLEX
@@ -261,12 +262,12 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
 
   rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD);
   }
 
   rv = mpc55xx_linflex_set_attributes(minor, &tty->termios);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES);
   }
 
   sc = mpc55xx_interrupt_handler_install(
@@ -278,7 +279,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL);
   }
 
   sc = mpc55xx_interrupt_handler_install(
@@ -290,7 +291,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL);
   }
 
   /*
@@ -303,7 +304,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL);
   }
   */
 
@@ -333,7 +334,7 @@ static int mpc55xx_linflex_last_close(int major, int minor, void* arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE);
   }
 
   sc = rtems_interrupt_handler_remove(
@@ -342,7 +343,7 @@ static int mpc55xx_linflex_last_close(int major, int minor, void* arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE);
   }
 
   /*
@@ -352,7 +353,7 @@ static int mpc55xx_linflex_last_close(int major, int minor, void* arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE);
   }
   */
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
index 70dbea75a4..596a9bd11b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
@@ -99,32 +99,6 @@ LINKER_SYMBOL(bsp_section_sysram_load_end)
 
 #define BSP_SYSRAM_SECTION __attribute__((section(".bsp_sysram")))
 
-typedef enum {
-  MPC55XX_FATAL_FMPLL_LOCK,
-  MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL,
-  MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER,
-  MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL,
-  MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_GENERIC_COUNT,
-  MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER,
-  MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE,
-  MPC55XX_FATAL_CONSOLE_ESCI_BAUD,
-  MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES,
-  MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE,
-  MPC55XX_FATAL_EDMA_IRQ_INSTALL,
-  MPC55XX_FATAL_EDMA_IRQ_REMOVE
-} mpc55xx_fatal_code;
-
-void mpc55xx_fatal(mpc55xx_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index ed3ef537b5..2c8ceed3a4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -61,11 +61,6 @@ void _BSP_Fatal_error(unsigned n)
 	}
 }
 
-void mpc55xx_fatal(mpc55xx_fatal_code code)
-{
-  rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
-}
-
 static void null_pointer_protection(void)
 {
 #ifdef MPC55XX_NULL_POINTER_PROTECTION
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
index f99efa22a5..b4c47579e4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
@@ -21,6 +21,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/start.h>
 #include <bsp/bootcard.h>
 #include <bsp/mpc55xx-config.h>
@@ -38,7 +39,7 @@
       }
 
       if (!lock) {
-        mpc55xx_fatal(MPC55XX_FATAL_FMPLL_LOCK);
+        bsp_fatal(MPC55XX_FATAL_FMPLL_LOCK);
       }
     }
   #endif