EmulatorPkg/PlatformBds: Signal EndOfDxe in platform BDS

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1079

Without signal of EndOfDxe, the 3rd party code (.efi from non-flash
storage) cannot run. It's forbidden by
8be37a5cee700777ca8e8e8a34cc2225b21931a7
*MdeModulePkg/SecurityStubDxe: Defer 3rd party image before EndOfDxe

The patch enables running of SCT from internal shell.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Cc: Andrew Fish <afish@apple.com>

diff --git a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c
index 3580d36779fd3ecc3ec8b321f25d4646341b1d7c..75fba847f4c5c702086e2a10bffa1d6fc5826615 100644 (file)
--- a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c
+++ b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++ @file\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
@@ -77,6 +77,8 @@ Returns:
 **/\r
 {\r
   SetupVariableInit ();\r
+\r
+  EfiEventGroupSignal (&gEfiEndOfDxeEventGroupGuid);\r
 }\r
 \r
 EFI_STATUS\r

diff --git a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
index a099fecda0ad9c453fb304daca639cc26fd0aa39..5ececd4bedcd1d9623498e691d8328cfa85c62f4 100644 (file)
--- a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
+++ b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
@@ -1,6 +1,6 @@
 /*++ @file\r
 \r
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiDxe.h>\r
 \r
 #include <Guid/EmuSystemConfig.h>\r
+#include <Guid/EventGroup.h>\r
 #include <Protocol/EmuThunk.h>\r
 #include <Protocol/EmuIoThunk.h>\r
 #include <Protocol/EmuGraphicsWindow.h>\r
@@ -32,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/GenericBdsLib.h>\r
 #include <Library/PlatformBdsLib.h>\r
 #include <Library/DevicePathLib.h>\r
+#include <Library/UefiLib.h>\r
 \r
 \r
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r

diff --git a/EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf b/EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf
index 526a159b9663f02396a6410fedd0aaa9f7e742a8..755c50c789057d9cc7603921783a209395aeed39 100644 (file)
--- a/EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf
+++ b/EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf
@@ -2,7 +2,7 @@
 # Platfrom BDS driver\r
 #\r
 # Do platform action customized by IBV/OEM.\r
-# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
@@ -51,10 +51,11 @@
   PcdLib\r
   GenericBdsLib\r
   DevicePathLib\r
-\r
+  UefiLib\r
 \r
 [Guids]\r
   gEmuSystemConfigGuid\r
+  gEfiEndOfDxeEventGroupGuid\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r