Remove SecurityPolicy.h from EdkModulePkg, because this protocol has been defined...

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

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 2a0b417380d18f7e977a52909931e85fc6166558..37a1a1fc6db627bee5c8f7681bfdfdcc1f83c494 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -330,10 +330,6 @@
       <IncludeHeader>Include/Protocol/ScsiIo.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
       <IncludeHeader>Include/Protocol/ScsiIo.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r

-    <IndustryStdHeader Name="SecurityPolicy">\r
-      <IncludeHeader>Include/Protocol/SecurityPolicy.h</IncludeHeader>\r
-      <HelpText/>\r
-    </IndustryStdHeader>\r

     <IndustryStdHeader Name="UgaIo">\r
       <IncludeHeader>Include/Protocol/UgaIo.h</IncludeHeader>\r
       <HelpText/>\r
     <IndustryStdHeader Name="UgaIo">\r
       <IncludeHeader>Include/Protocol/UgaIo.h</IncludeHeader>\r
       <HelpText/>\r

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index f07f27e8b2b1e01d0b9f0afe925ed56808025f9c..1b295d830b9235bedcac5b154f121bd0c7973a9b 100644 (file)
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -68,7 +68,6 @@ Abstract:
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/DiskInfo.h>\r
 #include <Protocol/FvbExtension.h>\r
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/DiskInfo.h>\r
 #include <Protocol/FvbExtension.h>\r

-#include <Protocol/SecurityPolicy.h>\r

 #include <Protocol/FaultTolerantWriteLite.h>\r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/OEMBadging.h>\r
 #include <Protocol/FaultTolerantWriteLite.h>\r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/OEMBadging.h>\r

diff --git a/EdkModulePkg/Include/Protocol/SecurityPolicy.h b/EdkModulePkg/Include/Protocol/SecurityPolicy.h
deleted file mode 100644 (file)
index f587b44..0000000
--- a/EdkModulePkg/Include/Protocol/SecurityPolicy.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  SecurityPolicy.h\r
-\r
-Abstract:\r
-\r
-  Security Policy protocol as defined in the DXE CIS\r
-\r
---*/\r
-\r
-#ifndef _SECURITY_POLICY_H_\r
-#define _SECURITY_POLICY_H_\r
-\r
-//\r
-// Security policy protocol GUID definition\r
-//\r
-#define EFI_SECURITY_POLICY_PROTOCOL_GUID  \\r
-  {0x78E4D245, 0xCD4D, 0x4a05, {0xA2, 0xBA, 0x47, 0x43, 0xE8, 0x6C, 0xFC, 0xAB} }\r
-\r
-extern EFI_GUID gEfiSecurityPolicyProtocolGuid;\r
-\r
-#endif\r