2 files changed, 5 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index 824b6f0c37..298bbc72dd 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -61,16 +61,14 @@ void BSP_panic( char *s)
 	}
 }
 
-void _BSP_Fatal_error( unsigned n)
+void _BSP_Fatal_error(unsigned n)
 {
 	rtems_interrupt_level level;
 
 	rtems_interrupt_disable( level);
 
-	printk( "%s PANIC ERROR %u\n", _RTEMS_version, n);
-
-	while (1) {
-		/* Do nothing */
+	while (true) {
+		mpc55xx_wait_for_interrupt();
 	}
 }
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/idle-thread.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/idle-thread.c
index a83640b55f..dbdc48bc46 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/idle-thread.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/idle-thread.c
@@ -22,14 +22,12 @@
 
 #include <bsp.h>
 
-#include <mpc55xx/regs.h>
+#include <mpc55xx/mpc55xx.h>
 
 void *bsp_idle_thread(uintptr_t arg)
 {
   while (true) {
-    #ifdef MPC55XX_HAS_WAIT_INSTRUCTION
-      __asm__ volatile ("wait");
-    #endif
+    mpc55xx_wait_for_interrupt();
   }
 
   return NULL;