1. Added PcdNtEmulator and Removed MACRO EFI_NT_EMULATOR

2. Updated *.fpd of all Package.

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

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index e4ce17c6f95a155d0ab62f9b8b20cacb86a0a620..fe8fcd8d1cef5f08cc80066848e3743aebd5f851 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -2075,6 +2075,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -8022,6 +8030,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -12571,6 +12587,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -16942,6 +16966,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -20987,6 +21019,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -21076,6 +21116,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -21165,6 +21213,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 0cbca6d063bcd8ab323b9a56620071ee26e4a9f1..2e362adc8f2f98d1640bfb6d27b7c5a5de84a3be 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>EdkModulePkg</PackageName>\r
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>EdkModulePkg</PackageName>\r


@@ -1288,5 +1288,14 @@
       <DefaultValue>TRUE</DefaultValue>\r
       <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>\r
     </PcdEntry>\r
       <DefaultValue>TRUE</DefaultValue>\r
       <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>\r
     </PcdEntry>\r

+    <PcdEntry>\r
+      <C_Name>PcdNtEmulatorEnable</C_Name>\r
+      <Token>0x0001003e</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>\r
+    </PcdEntry>\r

   </PcdDeclarations>\r
   </PcdDeclarations>\r

-</PackageSurfaceArea>\r
+</PackageSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 5c14254a0c1b8a905e42091627b7991364622aa5..6d1be7594a490c32cf5da3d36fb07418e291824a 100644 (file)
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -8,11 +8,11 @@
     <Abstract>Component description file for DebugSupport module.</Abstract>\r
     <Description>This driver installs DebugSupport protocol for the selected processor.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <Abstract>Component description file for DebugSupport module.</Abstract>\r
     <Description>This driver installs DebugSupport protocol for the selected processor.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

-    <License>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
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -43,6 +43,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r
+      <Keyword>PcdLib</Keyword>\r
+    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DebugSupport.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DebugSupport.c</Filename>\r


@@ -63,14 +66,14 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="SOMETIMES_PRODUCED">\r
       <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="SOMETIMES_PRODUCED">\r
       <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>\r

-      <HelpText>If the debug support protocol for this processor type is not \r
-        already installed, this protocol will be installed. Otherwise, it will\r
-        be not installed again.\r
-      </HelpText>\r
+      <HelpText>If the debug support protocol for this processor type is not
+        already installed, this protocol will be installed. Otherwise, it will
+        be not installed again.</HelpText>\r

     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r


@@ -83,4 +86,11 @@
       <ModuleEntryPoint>InitializeDebugSupportDriver</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r
       <ModuleEntryPoint>InitializeDebugSupportDriver</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r

-</ModuleSurfaceArea>\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">\r
+      <C_Name>PcdNtEmulatorEnable</C_Name>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>\r
+    </PcdEntry>\r
+  </PcdCoded>\r
+</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
index 270a158b7972e221e63723ecc67128a6e16c38ed..88b8c5a14acaae74879afaa7074057ff5c564b4f 100644 (file)
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
@@ -1,14 +1,14 @@
 /**@file\r
   IA32 specific debug support functions\r
 /**@file\r
   IA32 specific debug support functions\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
+Copyright (c) 2006 - 2007, 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
 **/\r
 \r
 \r
 **/\r
 \r


@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 IDT_ENTRY   *IdtEntryTable  = NULL;\r
 DESCRIPTOR  NullDesc        = 0;\r
 \r
 IDT_ENTRY   *IdtEntryTable  = NULL;\r
 DESCRIPTOR  NullDesc        = 0;\r
 \r

-#ifndef EFI_NT_EMULATOR\r

 STATIC\r
 EFI_STATUS\r
 CreateEntryStub (\r
 STATIC\r
 EFI_STATUS\r
 CreateEntryStub (\r


@@ -77,7 +76,7 @@ Returns:
     // fixup the jump target to point to the common entry\r
     //\r
     *(UINT32 *) &StubCopy[0x0e] = (UINT32) CommonIdtEntry - (UINT32) &StubCopy[StubSize];\r
     // fixup the jump target to point to the common entry\r
     //\r
     *(UINT32 *) &StubCopy[0x0e] = (UINT32) CommonIdtEntry - (UINT32) &StubCopy[StubSize];\r

-    \r
+\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -158,7 +157,6 @@ Returns:
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

-#endif\r

 \r
 EFI_STATUS\r
 ManageIdtEntryTable (\r
 \r
 EFI_STATUS\r
 ManageIdtEntryTable (\r


@@ -193,33 +191,34 @@ Returns:
 \r
   Status = EFI_SUCCESS;\r
 \r
 \r
   Status = EFI_SUCCESS;\r
 \r

-#ifndef EFI_NT_EMULATOR\r
-  if (CompareDescriptor (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc)) {\r
-    //\r
-    // we've already installed to this vector\r
-    //\r
-    if (NewCallback != NULL) {\r
+  if (FeaturePcdGet (PcdNtEmulatorEnable)) {\r
+    if (CompareDescriptor (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc)) {\r

       //\r
       //\r

-      // if the input handler is non-null, error\r
+      // we've already installed to this vector\r

       //\r
       //\r

-      Status = EFI_ALREADY_STARTED;\r
+      if (NewCallback != NULL) {\r
+        //\r
+        // if the input handler is non-null, error\r
+        //\r
+        Status = EFI_ALREADY_STARTED;\r
+      } else {\r
+        Status = UnhookEntry (ExceptionType);\r
+      }\r

     } else {\r
     } else {\r

-      Status = UnhookEntry (ExceptionType);\r
-    }\r
-  } else {\r
-    //\r
-    // no user handler installed on this vector\r
-    //\r
-    if (NewCallback == NULL) {\r

       //\r
       //\r

-      // if the input handler is null, error\r
+      // no user handler installed on this vector\r

       //\r
       //\r

-      Status = EFI_INVALID_PARAMETER;\r
-    } else {\r
-      Status = HookEntry (ExceptionType, NewCallback);\r
+      if (NewCallback == NULL) {\r
+        //\r
+        // if the input handler is null, error\r
+        //\r
+        Status = EFI_INVALID_PARAMETER;\r
+      } else {\r
+        Status = HookEntry (ExceptionType, NewCallback);\r
+      }\r

     }\r
   }\r
     }\r
   }\r

-#endif\r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c b/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c
index 6fb4cdb542157091ba1c9dd63f50c319730519eb..3f12a76d6ceaa4002533030b5c4456f6d5d2a7d6 100644 (file)
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c
@@ -1,14 +1,14 @@
 /**@file\r
   X64 specific debug support functions\r
 \r
 /**@file\r
   X64 specific debug support functions\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
+Copyright (c) 2006 - 2007, 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
 **/\r
 \r
 \r
 **/\r
 \r


@@ -74,7 +74,7 @@ Returns:
     // fixup the jump target to point to the common entry\r
     //\r
     *(UINT32 *) &StubCopy[0x3] = (UINT32)((UINTN) CommonIdtEntry - (UINTN) &StubCopy[StubSize]);\r
     // fixup the jump target to point to the common entry\r
     //\r
     *(UINT32 *) &StubCopy[0x3] = (UINT32)((UINTN) CommonIdtEntry - (UINTN) &StubCopy[StubSize]);\r

-    \r
+\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -147,7 +147,7 @@ Returns:
 --*/\r
 {\r
   BOOLEAN     OldIntFlagState;\r
 --*/\r
 {\r
   BOOLEAN     OldIntFlagState;\r

-  \r
+\r

   OldIntFlagState = WriteInterruptFlag (0);\r
   WriteIdt (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));\r
   FreePool ((VOID *) (UINTN) IdtEntryTable[ExceptionType].StubEntry);\r
   OldIntFlagState = WriteInterruptFlag (0);\r
   WriteIdt (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));\r
   FreePool ((VOID *) (UINTN) IdtEntryTable[ExceptionType].StubEntry);\r

diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
index 3e4ef3ceeb37dd002e6e343534f1919719971e15..1aaeb648e57280e04736cc37519e18f5969f8170 100644 (file)
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
@@ -6,14 +6,14 @@
     <GuidValue>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DebugPort module.</Abstract>\r
     <GuidValue>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DebugPort module.</Abstract>\r

-    <Description>This driver binds exclusively to serial io on the controller handle, \r
+    <Description>This driver binds exclusively to serial io on the controller handle,

       and initializes serial Io interface, publishs DebugPort and device path Protocol.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
       and initializes serial Io interface, publishs DebugPort and device path Protocol.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

-    <License>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
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -60,12 +60,13 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>\r

-      <HelpText>gEfiDebugPortVariableGuid, gEfiDebugPortDevicePathGuid are \r
-        both the alias of gEfiDebugPortProtocolGuid. They are not separate guid variables,\r
+      <HelpText>gEfiDebugPortVariableGuid, gEfiDebugPortDevicePathGuid are
+        both the alias of gEfiDebugPortProtocolGuid. They are not separate guid variables,

         which are not required to be described in the followin Guids section.</HelpText>\r
     </Protocol>\r
     <Protocol Usage="BY_START">\r
         which are not required to be described in the followin Guids section.</HelpText>\r
     </Protocol>\r
     <Protocol Usage="BY_START">\r


@@ -85,8 +86,8 @@
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0044 0x0045 0x0042 0x0055 0x0047 0x0050 0x004F 0x0052 0x0054</VariableName>\r
       <GuidC_Name>gEfiDebugPortProtocolGuid</GuidC_Name>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0044 0x0045 0x0042 0x0055 0x0047 0x0050 0x004F 0x0052 0x0054</VariableName>\r
       <GuidC_Name>gEfiDebugPortProtocolGuid</GuidC_Name>\r

-      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is\r
-       one virtual guid, which can't be described in this section. \r
+      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is
+       one virtual guid, which can't be described in this section.

        So gEfiDebugPortProtocolGuid name is instead of it.</HelpText>\r
     </Variable>\r
   </Variables>\r
        So gEfiDebugPortProtocolGuid name is instead of it.</HelpText>\r
     </Variable>\r
   </Variables>\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
index 094140f14d6a620b009d1705b323ecb9706aeae1..56b21a3ac3fb2ca501fe7f52bb933711cf5f8c6b 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+Copyright (c) 2006 - 2007, 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
 \r
 Module Name:\r
 \r


@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-\r
-#ifdef TIANO_EXTENSION_FLAG\r
-EFI_GUID  UnknownDeviceGuid           = UNKNOWN_DEVICE_GUID;\r
-#endif \r
-\r

 EFI_GUID  mEfiWinNtThunkProtocolGuid  = EFI_WIN_NT_THUNK_PROTOCOL_GUID;\r
 EFI_GUID  mEfiWinNtUgaGuid            = EFI_WIN_NT_UGA_GUID;\r
 EFI_GUID  mEfiWinNtGopGuid            = EFI_WIN_NT_GOP_GUID;\r
 EFI_GUID  mEfiWinNtThunkProtocolGuid  = EFI_WIN_NT_THUNK_PROTOCOL_GUID;\r
 EFI_GUID  mEfiWinNtUgaGuid            = EFI_WIN_NT_UGA_GUID;\r
 EFI_GUID  mEfiWinNtGopGuid            = EFI_WIN_NT_GOP_GUID;\r


@@ -92,19 +87,19 @@ CatPrint (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-    Concatenates a formatted unicode string to allocated pool.  \r
+    Concatenates a formatted unicode string to allocated pool.\r

     The caller must free the resulting buffer.\r
 \r
 Arguments:\r
 \r
     The caller must free the resulting buffer.\r
 \r
 Arguments:\r
 \r

-    Str         - Tracks the allocated pool, size in use, and \r
+    Str         - Tracks the allocated pool, size in use, and\r

                   amount of pool allocated.\r
 \r
     fmt         - The format string\r
 \r
 Returns:\r
 \r
                   amount of pool allocated.\r
 \r
     fmt         - The format string\r
 \r
 Returns:\r
 \r

-    Allocated buffer with the formatted string printed in it.  \r
+    Allocated buffer with the formatted string printed in it.\r

     The caller must free the allocated buffer.   The buffer\r
     allocation is not packed.\r
 \r
     The caller must free the allocated buffer.   The buffer\r
     allocation is not packed.\r
 \r


@@ -163,7 +158,7 @@ Arguments:
 \r
 Returns:\r
 \r
 \r
 Returns:\r
 \r

-  If the memory for the device path is successfully allocated, then a \r
+  If the memory for the device path is successfully allocated, then a\r

   pointer to the new device path is returned.  Otherwise, NULL is returned.\r
 \r
 --*/\r
   pointer to the new device path is returned.  Otherwise, NULL is returned.\r
 \r
 --*/\r


@@ -434,7 +429,7 @@ DevPathExtendedAcpi (
   if (Index > Anchor) {\r
     CIDSTRIdx = Anchor;\r
   }\r
   if (Index > Anchor) {\r
     CIDSTRIdx = Anchor;\r
   }\r

-  \r
+\r

   if (HIDSTRIdx == 0 && CIDSTRIdx == 0 && ExtendedAcpi->UID == 0) {\r
     CatPrint (Str, L"AcpiExp(");\r
     if ((ExtendedAcpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
   if (HIDSTRIdx == 0 && CIDSTRIdx == 0 && ExtendedAcpi->UID == 0) {\r
     CatPrint (Str, L"AcpiExp(");\r
     if ((ExtendedAcpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r


@@ -1089,7 +1084,7 @@ LibDuplicateDevicePathInstance (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  Function creates a device path data structure that identically matches the \r
+  Function creates a device path data structure that identically matches the\r

   device path passed in.\r
 \r
 Arguments:\r
   device path passed in.\r
 \r
 Arguments:\r


@@ -1098,7 +1093,7 @@ Arguments:
 \r
 Returns:\r
 \r
 \r
 Returns:\r
 \r

-  The new copy of DevPath is created to identically match the input.  \r
+  The new copy of DevPath is created to identically match the input.\r

   Otherwise, NULL is returned.\r
 \r
 --*/\r
   Otherwise, NULL is returned.\r
 \r
 --*/\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 269a92d5579ccf6cc0f7fe8387583baed6f23735..1fac2da6e6e7c55839216171387a10f6e27f2c9b 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -3224,6 +3224,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -3305,6 +3313,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r

diff --git a/EdkUnixPkg/Unix.fpd b/EdkUnixPkg/Unix.fpd
index 1d88be05f598b6153558112e5fad3dbd213e469d..c5ffd9c603bfdcb58228b365406d908239b4b488 100644 (file)
--- a/EdkUnixPkg/Unix.fpd
+++ b/EdkUnixPkg/Unix.fpd
@@ -3216,6 +3216,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -3297,6 +3305,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdNtEmulatorEnable</C_Name>\r
+          <Token>0x0001003e</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 4a40a95526eeabc5db9b9046f22a09cf15b2147f..a77ad4639e05b35627e603f6839124fbd2dd1768 100644 (file)
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -140,32 +140,6 @@
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r

-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugPropertyMask</C_Name>\r
-          <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x0f</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-          <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-          <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>0x80000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-          <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0xAF</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r

       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r


@@ -670,16 +644,6 @@
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">\r

-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdFSBClock</C_Name>\r
-          <Token>0x0000000c</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>200000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r

       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r


@@ -704,32 +668,6 @@
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r

-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugPropertyMask</C_Name>\r
-          <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x0f</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-          <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-          <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>0x80000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-          <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0xAF</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r

       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r


@@ -1280,32 +1218,6 @@
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r

-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugPropertyMask</C_Name>\r
-          <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x0f</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-          <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-          <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>0x80000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-          <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0xAF</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r

       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r


@@ -1828,32 +1740,6 @@
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">\r

-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugPropertyMask</C_Name>\r
-          <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x0f</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-          <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-          <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>0x80000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-          <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0xAF</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r

       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r