git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@854 6f19259b...

diff --git a/EdkModulePkg/Include/EdkDxeDepex.h b/EdkModulePkg/Include/EdkDxeDepex.h
deleted file mode 100644 (file)
index 1ce8be1..0000000
--- a/EdkModulePkg/Include/EdkDxeDepex.h
+++ /dev/null
@@ -1,62 +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
-  EdkDxeDepex.h\r
-\r
-Abstract:\r
-  This include file is only used in *.DXS files. Do not use this \r
-  include file in normal DXE code.\r
-\r
-  Depex - Dependency Expresion\r
-\r
-  The BNF grammar is thus:\r
-     <depex>   ::= before GUID       \r
-                 | after GUID\r
-                 | SOR <bool>\r
-                 | <bool>            \r
-     <bool>    ::= <bool> and <term> \r
-                 | <bool> or <term>  \r
-                 | <term>            \r
-     <term>    ::= not <factor>      \r
-                 | <factor>          \r
-     <factor>  ::= <bool>            \r
-                 | <boolval>         \r
-                 | <depinst>         \r
-                 | <termval>         \r
-     <boolval> ::= true              \r
-                 | false             \r
-     <depinst> ::= push GUID         \r
-     <termval> ::= end               \r
-\r
---*/\r
-\r
-#ifndef __EDK_DXE_DEPEX_H__\r
-#define __EDK_DXE_DEPEX_H__\r
-\r
-#include <EdkDxe.h>\r
-\r
-//\r
-// The Depex grammer needs the following strings so we must undo\r
-// any pre-processor redefinitions\r
-//\r
-#undef DEPENDENCY_START   \r
-#undef BEFORE             \r
-#undef AFTER              \r
-#undef SOR                               \r
-#undef AND                \r
-#undef OR                 \r
-#undef NOT                \r
-#undef TRUE               \r
-#undef FALSE              \r
-#undef DEPENDENCY_END     \r
-\r
-#endif\r

diff --git a/EdkModulePkg/Include/EdkPeimDepex.h b/EdkModulePkg/Include/EdkPeimDepex.h
deleted file mode 100644 (file)
index 0b50599..0000000
--- a/EdkModulePkg/Include/EdkPeimDepex.h
+++ /dev/null
@@ -1,56 +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
-  EdkPeimDepex.h\r
-\r
-Abstract:\r
-  This include file is only used in *.DXS files. Do not use this \r
-  include file in normal Peim code.\r
-\r
-  Depex - Dependency Expresion\r
-\r
-  The BNF grammar is thus:\r
-     <depex>   ::= <bool>            \r
-     <bool>    ::= <bool> and <term> \r
-                 | <bool> or <term>  \r
-                 | <term>            \r
-     <term>    ::= not <factor>      \r
-                 | <factor>          \r
-     <factor>  ::= <bool>            \r
-                 | <boolval>         \r
-                 | <depinst>         \r
-                 | <termval>         \r
-     <boolval> ::= true              \r
-                 | false             \r
-     <depinst> ::= push GUID         \r
-     <termval> ::= end               \r
-\r
---*/\r
-\r
-#ifndef __EDK_PEIM_DEPEX_H__\r
-#define __EDK_PEIM_DEPEX_H__\r
-\r
-#include <EdkPeim.h>\r
-\r
-//\r
-// The Depex grammer needs the following strings so we must undo\r
-// any pre-processor redefinitions\r
-//\r
-#undef DEPENDENCY_START                          \r
-#undef AND                \r
-#undef OR                 \r
-#undef NOT                \r
-#undef TRUE               \r
-#undef FALSE                                        \r
-#undef DEPENDENCY_END     \r
-\r
-#endif\r