ArmPkg/DefaultExceptionHandlerLib: use console if available

[mirror_edk2.git] / ArmPkg / Library / DefaultExceptionHandlerLib / Arm / DefaultExceptionHandler.c

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
index cc79cb2fa3017bdd33fe7de616099f18a84aeb16..2e0cfb2d4e036a3f018159fdc23e4d857a1191cb 100644 (file)
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
@@ -21,6 +21,7 @@
 #include <Library/PrintLib.h>\r
 #include <Library/ArmDisassemblerLib.h>\r
 #include <Library/SerialPortLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
 #include <Guid/DebugImageInfoTable.h>\r
 \r
@@ -194,7 +195,10 @@ DefaultExceptionHandler (
 \r
   CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"\n%a Exception PC at 0x%08x  CPSR 0x%08x ",\r
          gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR);\r
-  SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
+  SerialPortWrite ((UINT8 *)Buffer, CharCount);\r
+  if (gST->ConOut != NULL) {\r
+    AsciiPrint (Buffer);\r
+  }\r
 \r
   DEBUG_CODE_BEGIN ();\r
     CHAR8   *Pdb;\r