1 files changed, 19 insertions, 10 deletions
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
index 51c09223dc..40a0e69bc0 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
@@ -113,35 +113,44 @@ SecTemporaryRamSupport (
   return EFI_SUCCESS;
 }
 
-VOID PeiCommonExceptionEntry(UINT32 Entry, UINT32 LR) {
+VOID
+PeiCommonExceptionEntry (
+  IN UINT32 Entry,
+  IN UINT32 LR
+  )
+{
+  CHAR8           Buffer[100];
+  UINTN           CharCount;
+
   switch (Entry) {
   case 0:
-    DEBUG((EFI_D_ERROR,"Reset Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Reset Exception at 0x%X\n\r",LR);
     break;
   case 1:
-    DEBUG((EFI_D_ERROR,"Undefined Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Undefined Exception at 0x%X\n\r",LR);
     break;
   case 2:
-    DEBUG((EFI_D_ERROR,"SWI Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"SWI Exception at 0x%X\n\r",LR);
     break;
   case 3:
-    DEBUG((EFI_D_ERROR,"PrefetchAbort Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"PrefetchAbort Exception at 0x%X\n\r",LR);
     break;
   case 4:
-    DEBUG((EFI_D_ERROR,"DataAbort Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"DataAbort Exception at 0x%X\n\r",LR);
     break;
   case 5:
-    DEBUG((EFI_D_ERROR,"Reserved Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Reserved Exception at 0x%X\n\r",LR);
     break;
   case 6:
-    DEBUG((EFI_D_ERROR,"IRQ Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"IRQ Exception at 0x%X\n\r",LR);
     break;
   case 7:
-    DEBUG((EFI_D_ERROR,"FIQ Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"FIQ Exception at 0x%X\n\r",LR);
     break;
   default:
-    DEBUG((EFI_D_ERROR,"Unknown Exception at 0x%X\n",LR));
+    CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Unknown Exception at 0x%X\n\r",LR);
     break;
   }
+  SerialPortWrite ((UINT8 *) Buffer, CharCount);
   while(1);
 }