From 5b664244561a6d697d1814e7c525cc6013863caf Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 15 Jan 2007 11:13:40 +0000
Subject: Correct TeImage file format and Clean up PeiRebase tool to remove
 unused code and only relocate image. Move two EFI_DEP_REPLACE_TRUE and
 DEPEX_STACK_SIZE_INCREMENT macros from MdePkg to EdkModule/DxeMain module,
 because these two macros are specific implementation, not defined in spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2249 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdePkg/Include/Common/Dependency.h           | 15 +++------------
 MdePkg/Include/Common/FirmwareFileSystem.h   |  7 -------
 MdePkg/Include/Common/FirmwareVolumeHeader.h |  7 +++++++
 3 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'MdePkg/Include')

diff --git a/MdePkg/Include/Common/Dependency.h b/MdePkg/Include/Common/Dependency.h
index d82cefd958..b38dcd5477 100644
--- a/MdePkg/Include/Common/Dependency.h
+++ b/MdePkg/Include/Common/Dependency.h
@@ -12,6 +12,9 @@
 
   Module Name:  Dependency.h
 
+  @par Revision Reference:
+  These definitions are from DxeCis 0.91 spec.
+
 **/
 
 #ifndef __DEPENDENCY_H__
@@ -34,16 +37,4 @@
 /// EFI_DEP_SOR          - If present, this must be the first opcode
 #define EFI_DEP_SOR           0x09
 
-///
-/// EFI_DEP_REPLACE_TRUE - Used to dynamically patch the dependecy expression
-///                        to save time.  A EFI_DEP_PUSH is evauated one an
-///                        replaced with EFI_DEP_REPLACE_TRUE
-///
-#define EFI_DEP_REPLACE_TRUE  0xff
-
-///
-/// Define the initial size of the dependency expression evaluation stack
-///
-#define DEPEX_STACK_SIZE_INCREMENT  0x1000
-
 #endif
diff --git a/MdePkg/Include/Common/FirmwareFileSystem.h b/MdePkg/Include/Common/FirmwareFileSystem.h
index 5678a95524..00ce8faff1 100644
--- a/MdePkg/Include/Common/FirmwareFileSystem.h
+++ b/MdePkg/Include/Common/FirmwareFileSystem.h
@@ -60,13 +60,6 @@
                                  EFI_FILE_HEADER_INVALID \
           )
 
-#define EFI_TEST_FFS_ATTRIBUTES_BIT(FvbAttributes, TestAttributes, Bit) \
-    ( \
-      (BOOLEAN) ( \
-          (FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit) \
-        ) \
-    )
-
 typedef UINT16  EFI_FFS_FILE_TAIL;
 
 ///
diff --git a/MdePkg/Include/Common/FirmwareVolumeHeader.h b/MdePkg/Include/Common/FirmwareVolumeHeader.h
index 038dce6f7f..c2bbddf3e9 100644
--- a/MdePkg/Include/Common/FirmwareVolumeHeader.h
+++ b/MdePkg/Include/Common/FirmwareVolumeHeader.h
@@ -70,6 +70,13 @@ typedef UINT32  EFI_FVB_ATTRIBUTES;
                               EFI_FVB_LOCK_CAP \
                               )
 
+#define EFI_TEST_FFS_ATTRIBUTES_BIT(FvbAttributes, TestAttributes, Bit) \
+    ( \
+      (BOOLEAN) ( \
+          (FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit) \
+        ) \
+    )
+
 #define EFI_FVB_STATUS    (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)
 
 ///
-- 
cgit v1.2.3