1. Added depex file generation

2. Added file type filter per the toolcode/toolchain/toolchain family/etc., and fixed the BaseLib.inf
3. Added unicode file parse support but commented out temporarily because of bugs
4. Fixed the unicode file format in Nt32Pkg/MiscSubClassPlatformDxe
5. Removed duplicated [Ppis.common] in MdePkg.dec
6. Added declaration of gEfiPeiMemoryDiscoveredPpiGuid in Nt32Pkg.dec

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

15 files changed, 7 insertions, 26 deletions

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index c363a23909..4e2b1f1a1e 100644
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 91407f17eb..26fb7941d0 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -60,7 +60,7 @@ ToolCodeMapping = {
     "Acpi-Source-Language"          :   "ASL",
     "Object"                        :   "SLINK",
     "Static-Library"                :   "DLINK",
-	"Dependency-Expression"			:	"PP",
+		"Dependency-Expression"         :   "PP",
 }
 
 ToolChainFamilyMapping = {
diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 858be7b026..5766f75f43 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -290,9 +290,9 @@
   x86EnablePaging32.c

   x86DisablePaging64.c

   x86DisablePaging32.c

-#  SynchronizationMsc.c  #|| INTC

-  SynchronizationMsc.c  #|| MSFT

-#  SynchronizationGcc.c  || GCC

+  Synchronization.c     || INTEL |||

+  SynchronizationMsc.c  || MSFT |||

+  SynchronizationGcc.c  || GCC |||

 

 [Sources.X64]

   X64/Thunk16.asm

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 609e331607..5f6d8176f9 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -296,26 +296,6 @@
 

 ################################################################################

 #

-# Global PPI Definition section - list of Global PPI C Name Data

-#                                  Structures that are provided by this package.

-#

-################################################################################

-[Ppis.common]

-  gEfiPeiStallPpiGuid            = { 0x1F4C6F90, 0xB06B, 0x48D8, { 0xA2, 0x01, 0xBA, 0xE5, 0xF1, 0xCD, 0x7D, 0x56 }}

-  gPcdPpiGuid                    = { 0x06E81C58, 0x4AD7, 0x44BC, { 0x83, 0x90, 0xF1, 0x02, 0x65, 0xF7, 0x24, 0x80 }}

-  gEfiPeiStatusCodePpiGuid       = { 0x229832D3, 0x7A30, 0x4B36, { 0xB8, 0x27, 0xF4, 0x0C, 0xB7, 0xD4, 0x54, 0x36 }}

-  gEfiSecPlatformInformationPpiGuid = { 0x6F8C2B35, 0xFEF4, 0x448D, { 0x82, 0x56, 0xE1, 0x1B, 0x19, 0xD6, 0x10, 0x77 }}

-  gEfiPeiResetPpiGuid            = { 0xEF398D58, 0x9DFD, 0x4103, { 0xBF, 0x94, 0x78, 0xC6, 0xF4, 0xFE, 0x71, 0x2F }}

-  gEfiPeiMemoryDiscoveredPpiGuid = { 0xF894643D, 0xC449, 0x42D1, { 0x8E, 0xA8, 0x85, 0xBD, 0xD8, 0xC6, 0x5B, 0xDE }}

-  gEfiPeiMasterBootModePpiGuid   = { 0x7408D748, 0xFC8C, 0x4EE6, { 0x92, 0x88, 0xC4, 0xBE, 0xC0, 0x92, 0xA4, 0x10 }}

-  gEfiPeiFvFileLoaderPpiGuid     = { 0x7E1F0D85, 0x04FF, 0x4BB2, { 0x86, 0x6A, 0x31, 0xA2, 0x99, 0x6A, 0x48, 0xA8 }}

-  gEfiEndOfPeiSignalPpiGuid      = { 0x605EA650, 0xC65C, 0x42E1, { 0xBA, 0x80, 0x91, 0xA5, 0x2A, 0xB6, 0x18, 0xC6 }}

-  gEfiDxeIplPpiGuid              = { 0x0AE8CE5D, 0xE448, 0x4437, { 0xA8, 0xD7, 0xEB, 0xF5, 0xF1, 0x94, 0xF7, 0x31 }}

-  gEfiPeiCpuIoPpiInServiceTableGuid = { 0xE6AF1F7B, 0xFC3F, 0x46DA, { 0xA8, 0x28, 0xA3, 0xB4, 0x57, 0xA4, 0x42, 0x82 }}

-  gEfiPeiBootInRecoveryModePpiGuid = { 0x17EE496A, 0xD8E4, 0x4B9A, { 0x94, 0xD1, 0xCE, 0x82, 0x72, 0x30, 0x08, 0x50 }}

-

-################################################################################

-#

 # PCD Declarations section - list of all PCDs Declared by this Package

 #                            Only this package should be providing the

 #                            declaration, other packages should not.

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
index 62280724a8..14a68936ef 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
index ecade7465d..b1e7e520fc 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
index eac153a18b..67bee85037 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni
index 9306f0f03d..fb79bdbde1 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
index aa5ea7051c..b6a617b75e 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
index cc426403cd..bae6862210 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
index c48a8b760a..36dacf066a 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
index 2933b8a134..204588ef8c 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
index eec73f842f..617578d6a3 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
index ac37d53670..f279ff960d 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index 99196bd48b..0476aeb28b 100644
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -78,7 +78,8 @@
 [Ppis.common]

   gPeiNtThunkPpiGuid             = { 0x98c281e5, 0xf906, 0x43dd, { 0xa9, 0x2b, 0xb0, 0x03, 0xbf, 0x27, 0x65, 0xda }}

   gPeiNtAutoScanPpiGuid          = { 0x0dce384d, 0x007c, 0x4ba5, { 0x94, 0xbd, 0x0f, 0x6e, 0xb6, 0x4d, 0x2a, 0xa9 }}

-  

+	gEfiPeiMemoryDiscoveredPpiGuid = { 0xF894643D, 0xC449, 0x42D1, { 0x8E, 0xA8, 0x85, 0xBD, 0xD8, 0xC6, 0x5B, 0xDE }}

+

 ################################################################################

 #

 # Global Protocols Definition section - list of Global Protocols C Name Data

@@ -119,4 +120,4 @@
 [PcdsPatchableInModule.common]

   PcdWinNtBootMode|0x00001006|gEfiNt32PkgTokenSpaceGuid|UINT32|1

   PcdWinNtFirmwareVolume|0x00001009|gEfiNt32PkgTokenSpaceGuid|VOID*|L"..\\Fv\\Fv_Recovery.fd"

-  PcdWinNtMemorySizeForSecMain|0x0000100c|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"
\ No newline at end of file
+  PcdWinNtMemorySizeForSecMain|0x0000100c|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"