Add a PE/COFF extra action lib that DEBUG prints the debugger command to load symbols...

[mirror_edk2.git] / BeagleBoardPkg / Sec / Sec.c

diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c
index fa18038a9a055a3dec6cfa2267f2d67d1f85dbc0..a9bd00690f99b2076875e2b55b8814a3cc7f2571 100644 (file)
--- a/BeagleBoardPkg/Sec/Sec.c
+++ b/BeagleBoardPkg/Sec/Sec.c
@@ -22,6 +22,7 @@
 #include <Library/OmapLib.h>\r
 #include <Library/ArmLib.h>\r
 #include <Library/PeCoffGetEntryPointLib.h>\r
+#include <Library/DebugAgentLib.h>\r
 \r
 #include <Ppi/GuidedSectionExtraction.h>\r
 #include <Guid/LzmaDecompress.h>\r
@@ -29,17 +30,6 @@
 \r
 #include "LzmaDecompress.h"\r
 \r
-VOID\r
-EFIAPI \r
-_ModuleEntryPoint(\r
-  VOID\r
-  );\r
-\r
-CHAR8 *\r
-DeCygwinPathIfNeeded (\r
-  IN  CHAR8   *Name\r
-  );\r
-\r
 VOID\r
 PadConfiguration (\r
   VOID\r
@@ -50,6 +40,7 @@ ClockInit (
   VOID\r
   );\r
 \r
+\r
 VOID\r
 TimerInit (\r
   VOID\r
@@ -59,8 +50,7 @@ TimerInit (
   UINT32 TimerBaseAddress = TimerBase(Timer);\r
 \r
   // Set source clock for GPT3 & GPT4 to SYS_CLK\r
-  MmioOr32(CM_CLKSEL_PER, CM_CLKSEL_PER_CLKSEL_GPT3_SYS \r
-                          | CM_CLKSEL_PER_CLKSEL_GPT4_SYS);\r
+  MmioOr32 (CM_CLKSEL_PER, CM_CLKSEL_PER_CLKSEL_GPT3_SYS | CM_CLKSEL_PER_CLKSEL_GPT4_SYS);\r
 \r
   // Set count & reload registers\r
   MmioWrite32 (TimerBaseAddress + GPTIMER_TCRR, 0x00000000);\r
@@ -127,52 +117,6 @@ LzmaDecompressLibConstructor (
   VOID\r
   );\r
 \r
-/**\r
-  If the build is done on cygwin the paths are cygpaths. \r
-  /cygdrive/c/tmp.txt vs c:\tmp.txt so we need to convert\r
-  them to work with RVD commands\r
-\r
-  This is just code to help print out RVD symbol load command.\r
-  If you build with cygwin paths aren't compatible with RVD.\r
-\r
-  @param  Name  Path to convert if needed\r
-\r
-**/\r
-CHAR8 *\r
-SecDeCygwinPathIfNeeded (\r
-  IN  CHAR8   *Name\r
-  )\r
-{\r
-  CHAR8   *Ptr;\r
-  UINTN   Index;\r
-  UINTN   Len;\r
-  \r
-  Ptr = AsciiStrStr (Name, "/cygdrive/");\r
-  if (Ptr == NULL) {\r
-    return Name;\r
-  }\r
-  \r
-  Len = AsciiStrLen (Ptr);\r
-  \r
-  // convert "/cygdrive" to spaces\r
-  for (Index = 0; Index < 9; Index++) {\r
-    Ptr[Index] = ' ';\r
-  }\r
-\r
-  // convert /c to c:\r
-  Ptr[9]  = Ptr[10];\r
-  Ptr[10] = ':';\r
-  \r
-  // switch path seperators\r
-  for (Index = 11; Index < Len; Index++) {\r
-    if (Ptr[Index] == '/') {\r
-      Ptr[Index] = '\\' ;\r
-    }\r
-  }\r
-\r
-  return Name;\r
-}\r
-\r
 \r
 VOID\r
 CEntryPoint (\r
@@ -209,52 +153,11 @@ CEntryPoint (
 \r
   // Start talking\r
   UartInit ();\r
-  DEBUG ((EFI_D_ERROR, "UART Enabled\n"));\r
-\r
-  DEBUG_CODE_BEGIN ();\r
-    //\r
-    // On a debug build print out information about the SEC. This is really info about\r
-    // the PE/COFF file we are currently running from. Useful for loading symbols in a\r
-    // debugger. Remember our image is really part of the FV.\r
-    //\r
-    RETURN_STATUS       Status;\r
-    EFI_PEI_FV_HANDLE   VolumeHandle;\r
-    EFI_PEI_FILE_HANDLE FileHandle;\r
-    VOID                *PeCoffImage;\r
-    UINT32              Offset;\r
-    CHAR8               *FilePath;\r
-    FfsAnyFvFindFirstFile (EFI_FV_FILETYPE_SECURITY_CORE, &VolumeHandle, &FileHandle);\r
-    Status = FfsFindSectionData (EFI_SECTION_TE, FileHandle, &PeCoffImage);\r
-    if (EFI_ERROR (Status)) {\r
-      // Usually is a TE (PI striped down PE/COFF), but could be a full PE/COFF\r
-      Status = FfsFindSectionData (EFI_SECTION_PE32, FileHandle, &PeCoffImage);\r
-    }\r
-    if (!EFI_ERROR (Status)) {\r
-      Offset = PeCoffGetSizeOfHeaders (PeCoffImage);\r
-      FilePath = PeCoffLoaderGetPdbPointer (PeCoffImage);\r
-      if (FilePath != NULL) {\r
-      \r
-        // \r
-        // In general you should never have to use #ifdef __CC_ARM in the code. It\r
-        // is hidden in the away in the MdePkg. But here we would like to print differnt things\r
-        // for different toolchains. \r
-        //\r
-#ifdef __CC_ARM\r
-        // Print out the command for the RVD debugger to load symbols for this image\r
-        DEBUG ((EFI_D_ERROR, "load /a /ni /np %a &0x%08x\n", SecDeCygwinPathIfNeeded (FilePath), (CHAR8 *)PeCoffImage + Offset));\r
-#elif __GNUC__\r
-        // This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required\r
-        DEBUG ((EFI_D_ERROR, "add-symbol-file %a 0x%08x\n", FilePath, PeCoffImage + Offset));\r
-#else\r
-        DEBUG ((EFI_D_ERROR, "SEC starts at 0x%08x with an entry point at 0x%08x %a\n", PeCoffImage, _ModuleEntryPoint, FilePath));\r
-#endif\r
-      }\r
-    }\r
-\r
-   \r
-  DEBUG_CODE_END ();\r
-\r
+ \r
+  InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, NULL);\r
+  SaveAndSetDebugTimerInterrupt (TRUE);\r
 \r
+  DEBUG ((EFI_D_ERROR, "UART Enabled\n"));\r
 \r
   // Start up a free running time so that the timer lib will work\r
   TimerInit ();\r