1. Sync definition of EFI_DEBUG_IMAGE_INFO with UEFI spec

2. Make performance data for End of BDS is not recorded in Boot Manager Boot


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2431 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 5 insertions, 1 deletions

diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
index 755c042..4513aa9 100644
--- a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -124,6 +124,11 @@ Returns:
   EFI_BLOCK_IO_PROTOCOL     *BlkIo;

   VOID                      *Buffer;

 

+  //

+  // Record the performance data for End of BDS

+  //

+  PERF_END (0, BDS_TOK, NULL, 0);

+

   *ExitDataSize = 0;

   *ExitData     = NULL;

 

diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
index 7c219b6..07789a3 100644
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
@@ -218,7 +218,6 @@ Returns:
     // All the driver options should have been processed since

     // now boot will be performed.

     //

-    PERF_END (0, BDS_TOK, NULL, 0);

     Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);

     if (EFI_ERROR (Status)) {

       //