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

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index c363a2390909c1a868b3f1a5e700392f8c2eee79..4e2b1f1a1e95033a16206deb72e54488c3ea048e 100644 (file)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 91407f17eb5f0367bf4f7e8201e1a3930d56ee3b..26fb7941d0a7ad69e62a3a1fe4149bd278cc9f5e 100644 (file)
--- 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 858be7b026c26ba5bce08c228f338fe605b414e1..5766f75f43ca36fcbe87aace67845ebf21bf0156 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -290,9 +290,9 @@
   x86EnablePaging32.c\r
   x86DisablePaging64.c\r
   x86DisablePaging32.c\r
-#  SynchronizationMsc.c  #|| INTC\r
-  SynchronizationMsc.c  #|| MSFT\r
-#  SynchronizationGcc.c  || GCC\r
+  Synchronization.c     || INTEL |||\r
+  SynchronizationMsc.c  || MSFT |||\r
+  SynchronizationGcc.c  || GCC |||\r
 \r
 [Sources.X64]\r
   X64/Thunk16.asm\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 609e3316073001618b6180796e705891bccc6708..5f6d8176f9c6e1aef5e264da171acc92457cd98e 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -294,26 +294,6 @@
 ## BugBug: HII related protocols should be defined.\r
   gEfiFormBrowserProtocolGuid    = { 0xE5A1333E, 0xE1B4, 0x4D55, { 0xCE, 0xEB, 0x35, 0xC3, 0xEF, 0x13, 0x34, 0x43 }}\r
 \r
-################################################################################\r
-#\r
-# Global PPI Definition section - list of Global PPI C Name Data\r
-#                                  Structures that are provided by this package.\r
-#\r
-################################################################################\r
-[Ppis.common]\r
-  gEfiPeiStallPpiGuid            = { 0x1F4C6F90, 0xB06B, 0x48D8, { 0xA2, 0x01, 0xBA, 0xE5, 0xF1, 0xCD, 0x7D, 0x56 }}\r
-  gPcdPpiGuid                    = { 0x06E81C58, 0x4AD7, 0x44BC, { 0x83, 0x90, 0xF1, 0x02, 0x65, 0xF7, 0x24, 0x80 }}\r
-  gEfiPeiStatusCodePpiGuid       = { 0x229832D3, 0x7A30, 0x4B36, { 0xB8, 0x27, 0xF4, 0x0C, 0xB7, 0xD4, 0x54, 0x36 }}\r
-  gEfiSecPlatformInformationPpiGuid = { 0x6F8C2B35, 0xFEF4, 0x448D, { 0x82, 0x56, 0xE1, 0x1B, 0x19, 0xD6, 0x10, 0x77 }}\r
-  gEfiPeiResetPpiGuid            = { 0xEF398D58, 0x9DFD, 0x4103, { 0xBF, 0x94, 0x78, 0xC6, 0xF4, 0xFE, 0x71, 0x2F }}\r
-  gEfiPeiMemoryDiscoveredPpiGuid = { 0xF894643D, 0xC449, 0x42D1, { 0x8E, 0xA8, 0x85, 0xBD, 0xD8, 0xC6, 0x5B, 0xDE }}\r
-  gEfiPeiMasterBootModePpiGuid   = { 0x7408D748, 0xFC8C, 0x4EE6, { 0x92, 0x88, 0xC4, 0xBE, 0xC0, 0x92, 0xA4, 0x10 }}\r
-  gEfiPeiFvFileLoaderPpiGuid     = { 0x7E1F0D85, 0x04FF, 0x4BB2, { 0x86, 0x6A, 0x31, 0xA2, 0x99, 0x6A, 0x48, 0xA8 }}\r
-  gEfiEndOfPeiSignalPpiGuid      = { 0x605EA650, 0xC65C, 0x42E1, { 0xBA, 0x80, 0x91, 0xA5, 0x2A, 0xB6, 0x18, 0xC6 }}\r
-  gEfiDxeIplPpiGuid              = { 0x0AE8CE5D, 0xE448, 0x4437, { 0xA8, 0xD7, 0xEB, 0xF5, 0xF1, 0x94, 0xF7, 0x31 }}\r
-  gEfiPeiCpuIoPpiInServiceTableGuid = { 0xE6AF1F7B, 0xFC3F, 0x46DA, { 0xA8, 0x28, 0xA3, 0xB4, 0x57, 0xA4, 0x42, 0x82 }}\r
-  gEfiPeiBootInRecoveryModePpiGuid = { 0x17EE496A, 0xD8E4, 0x4B9A, { 0x94, 0xD1, 0xCE, 0x82, 0x72, 0x30, 0x08, 0x50 }}\r
-\r
 ################################################################################\r
 #\r
 # PCD Declarations section - list of all PCDs Declared by this Package\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
index 62280724a8cdbe6180ff3d333d139c98e1595284..14a68936efd1c0008d99482a861ebe7a4414d98c 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
index ecade7465d3712c46cf0dda15df9e77cf19769b9..b1e7e520fc2ea6a7a327a1464bde11c94619cb68 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
index eac153a18b631b731f6ad2dccd6cb33692f52ca9..67bee85037c6b2ee749495a7b1156e2bc5298a18 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni
index 9306f0f03d4ab39bfee0f2bdbd76a7c5d793b10c..fb79bdbde1e3f02b283f0b9e9a427560df4c15b4 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemString.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
index aa5ea7051c3d79ea8a09c7b6a414ec47cee55963..b6a617b75e642448050d86572f9207ae92b33785 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
index cc426403cdc2d207eb0b3a0d7e1962952c96b720..bae68622105d1f2cda801d57a1e1712d1857c5c1 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
index c48a8b760a566153522f17b0004d168dbf7a3d99..36dacf066ac0b23d688bf2b17c0a5f966bee9807 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
index 2933b8a13429272c2e70a4a3a3510220bfc58888..204588ef8c69d2ffdf8ad4e2e2dbaec223e9f688 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
index eec73f842f60e1ec8f39d6995c4cd5d4d9031c26..617578d6a3395e6f977900480b286f1c5330c45e 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
index ac37d536708a253dc583d192b8b93c1b035282cf..f279ff960daa5ab57ad575feb11579208dd3a211 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni differ

diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index 99196bd48bedcdbc6685670ee7064cdb9719e622..0476aeb28b8b073dd1c3f0b7c47f7c786bda8653 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -78,7 +78,8 @@
 [Ppis.common]\r
   gPeiNtThunkPpiGuid             = { 0x98c281e5, 0xf906, 0x43dd, { 0xa9, 0x2b, 0xb0, 0x03, 0xbf, 0x27, 0x65, 0xda }}\r
   gPeiNtAutoScanPpiGuid          = { 0x0dce384d, 0x007c, 0x4ba5, { 0x94, 0xbd, 0x0f, 0x6e, 0xb6, 0x4d, 0x2a, 0xa9 }}\r
-  \r
+       gEfiPeiMemoryDiscoveredPpiGuid = { 0xF894643D, 0xC449, 0x42D1, { 0x8E, 0xA8, 0x85, 0xBD, 0xD8, 0xC6, 0x5B, 0xDE }}\r
+\r
 ################################################################################\r
 #\r
 # Global Protocols Definition section - list of Global Protocols C Name Data\r
@@ -119,4 +120,4 @@
 [PcdsPatchableInModule.common]\r
   PcdWinNtBootMode|0x00001006|gEfiNt32PkgTokenSpaceGuid|UINT32|1\r
   PcdWinNtFirmwareVolume|0x00001009|gEfiNt32PkgTokenSpaceGuid|VOID*|L"..\\Fv\\Fv_Recovery.fd"\r
-  PcdWinNtMemorySizeForSecMain|0x0000100c|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"
\ No newline at end of file
+  PcdWinNtMemorySizeForSecMain|0x0000100c|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"\r