Remove R2627 commit. Roll back R2626.

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

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
index a55fb432e03d131ea8b2f0f3a453e1386684e261..15736c6ca962e7a7d23e059db83860a6ce57c9f4 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
@@ -48,7 +48,6 @@ Returns:
   EFI_STATUS  Status;\r
   EFI_HANDLE  NewHandle;\r
 \r
-  EFI_DEADLOOP ();\r
   SystemTable->RuntimeServices->UpdateCapsule                    = UpdateCapsule;\r
   SystemTable->RuntimeServices->QueryCapsuleCapabilities         = QueryCapsuleCapabilities;\r
 \r

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index b80b8f7a245cef0d434e3800c39bc4e6354eeacb..b7b946e1fa87f6c4f6875c6a43a5b3a9a442a2cb 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -22,10 +22,6 @@
     <OutputFileBasename>CapsuleRuntime</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index 202d6a3586a8bae422b55f34714ee01a87d73162..a7cb5f68c9e6589cd3a0ff9b503be04932cf1514 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -156,7 +156,6 @@ Returns:
 {\r
   EFI_STATUS  Status;\r
 \r
-  EFI_DEADLOOP ();\r
   Status = VariableCommonInitialize (ImageHandle, SystemTable);\r
   ASSERT_EFI_ERROR (Status);\r
 \r