]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/AutoGen/AutoGen.py
BaseTools: Autogen - modify to use standard parent/child class relationships
[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py
index fe565743576bd6bd7688e4e454a60dde1583a3d1..aeeab9190473c7af9b85819d34c8f164e93644b8 100644 (file)
@@ -1,7 +1,7 @@
 ## @file\r
 # Generate AutoGen.h, AutoGen.c and *.depex files\r
 #\r
-# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # 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
@@ -42,6 +42,9 @@ from GenPcdDb import CreatePcdDatabaseCode
 from Workspace.MetaFileCommentParser import UsageList\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 import InfSectionParser\r
+import datetime\r
+import hashlib\r
+from GenVar import VariableMgr,var_info\r
 \r
 ## Regular expression for splitting Dependency Expression string into tokens\r
 gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")\r
@@ -61,7 +64,10 @@ gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
 \r
 \r
 ## Build rule configuration file\r
-gDefaultBuildRuleFile = 'Conf/build_rule.txt'\r
+gDefaultBuildRuleFile = 'build_rule.txt'\r
+\r
+## Tools definition configuration file\r
+gDefaultToolsDefFile = 'tools_def.txt'\r
 \r
 ## Build rule default version\r
 AutoGenReqBuildRuleVerNum = "0.1"\r
@@ -72,7 +78,8 @@ gAutoGenHeaderFileName = "AutoGen.h"
 gAutoGenStringFileName = "%(module_name)sStrDefs.h"\r
 gAutoGenStringFormFileName = "%(module_name)sStrDefs.hpk"\r
 gAutoGenDepexFileName = "%(module_name)s.depex"\r
-\r
+gAutoGenImageDefFileName = "%(module_name)sImgDefs.h"\r
+gAutoGenIdfFileName = "%(module_name)sIdf.hpk"\r
 gInfSpecVersion = "0x00010017"\r
 \r
 #\r
@@ -138,6 +145,8 @@ ${END}
 \r
 ${depexsection_item}\r
 \r
+${userextension_tianocore_item}\r
+\r
 ${tail_comments}\r
 \r
 [BuildOptions.${module_arch}]\r
@@ -150,8 +159,8 @@ ${tail_comments}
 #   This class just implements the cache mechanism of AutoGen objects.\r
 #\r
 class AutoGen(object):\r
-    # database to maintain the objects of xxxAutoGen\r
-    _CACHE_ = {}    # (BuildTarget, ToolChain) : {ARCH : {platform file: AutoGen object}}}\r
+    # database to maintain the objects in each child class\r
+    __ObjectCache = {}    # (BuildTarget, ToolChain, ARCH, platform file): AutoGen object\r
 \r
     ## Factory method\r
     #\r
@@ -165,24 +174,19 @@ class AutoGen(object):
     #   @param  *args           The specific class related parameters\r
     #   @param  **kwargs        The specific class related dict parameters\r
     #\r
-    def __new__(Class, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
+    def __new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
         # check if the object has been created\r
-        Key = (Target, Toolchain)\r
-        if Key not in Class._CACHE_ or Arch not in Class._CACHE_[Key] \\r
-           or MetaFile not in Class._CACHE_[Key][Arch]:\r
-            AutoGenObject = super(AutoGen, Class).__new__(Class)\r
-            # call real constructor\r
-            if not AutoGenObject._Init(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
-                return None\r
-            if Key not in Class._CACHE_:\r
-                Class._CACHE_[Key] = {}\r
-            if Arch not in Class._CACHE_[Key]:\r
-                Class._CACHE_[Key][Arch] = {}\r
-            Class._CACHE_[Key][Arch][MetaFile] = AutoGenObject\r
-        else:\r
-            AutoGenObject = Class._CACHE_[Key][Arch][MetaFile]\r
+        Key = (Target, Toolchain, Arch, MetaFile)\r
+        try:\r
+            # if it exists, just return it directly\r
+            return cls.__ObjectCache[Key]\r
+        except:\r
+            # it didnt exist. create it, cache it, then return it\r
+            cls.__ObjectCache[Key] = super(AutoGen, cls).__new__(cls)\r
+            return cls.__ObjectCache[Key]\r
 \r
-        return AutoGenObject\r
+    def __init__ (self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
+        super(AutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
 \r
     ## hash() operator\r
     #\r
@@ -212,10 +216,16 @@ class AutoGen(object):
 # architecture. This class will generate top level makefile.\r
 #\r
 class WorkspaceAutoGen(AutoGen):\r
-    ## Real constructor of WorkspaceAutoGen\r
-    #\r
-    # This method behaves the same as __init__ except that it needs explicit invoke\r
-    # (in super class's __new__ method)\r
+    # call super().__init__ then call the worker function with different parameter count\r
+    def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
+        try:\r
+            self._Init\r
+        except:\r
+            super(WorkspaceAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            self._Init = True\r
+    \r
+    ## Initialize WorkspaceAutoGen\r
     #\r
     #   @param  WorkspaceDir            Root directory of workspace\r
     #   @param  ActivePlatform          Meta-file of active platform\r
@@ -231,8 +241,8 @@ class WorkspaceAutoGen(AutoGen):
     #   @param  Caps                    Capsule list to be generated\r
     #   @param  SkuId                   SKU id from command line\r
     #\r
-    def _Init(self, WorkspaceDir, ActivePlatform, Target, Toolchain, ArchList, MetaFileDb,\r
-              BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None, \r
+    def _InitWorker(self, WorkspaceDir, ActivePlatform, Target, Toolchain, ArchList, MetaFileDb,\r
+              BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None,\r
               Progress=None, BuildModule=None):\r
         if Fds is None:\r
             Fds = []\r
@@ -258,6 +268,11 @@ class WorkspaceAutoGen(AutoGen):
         self.FvTargetList   = Fvs\r
         self.CapTargetList  = Caps\r
         self.AutoGenObjectList = []\r
+        self._BuildDir      = None\r
+        self._FvDir         = None\r
+        self._MakeFileDir   = None\r
+        self._BuildCommand  = None\r
+        self._GuidDict = {}\r
 \r
         # there's many relative directory operations, so ...\r
         os.chdir(self.WorkspaceDir)\r
@@ -280,7 +295,7 @@ class WorkspaceAutoGen(AutoGen):
 \r
         # Validate build target\r
         if self.BuildTarget not in self.Platform.BuildTargets:\r
-            EdkLogger.error("build", PARAMETER_INVALID, \r
+            EdkLogger.error("build", PARAMETER_INVALID,\r
                             ExtraData="Build target [%s] is not supported by the platform. [Valid target: %s]"\r
                                       % (self.BuildTarget, " ".join(self.Platform.BuildTargets)))\r
 \r
@@ -288,41 +303,84 @@ class WorkspaceAutoGen(AutoGen):
         # parse FDF file to get PCDs in it, if any\r
         if not self.FdfFile:\r
             self.FdfFile = self.Platform.FlashDefinition\r
-        \r
+\r
         EdkLogger.info("")\r
         if self.ArchList:\r
             EdkLogger.info('%-16s = %s' % ("Architecture(s)", ' '.join(self.ArchList)))\r
         EdkLogger.info('%-16s = %s' % ("Build target", self.BuildTarget))\r
-        EdkLogger.info('%-16s = %s' % ("Toolchain",self.ToolChain))        \r
-        \r
+        EdkLogger.info('%-16s = %s' % ("Toolchain", self.ToolChain))\r
+\r
         EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.Platform))\r
         if BuildModule:\r
             EdkLogger.info('%-24s = %s' % ("Active Module", BuildModule))\r
-        \r
+\r
         if self.FdfFile:\r
             EdkLogger.info('%-24s = %s' % ("Flash Image Definition", self.FdfFile))\r
 \r
         EdkLogger.verbose("\nFLASH_DEFINITION = %s" % self.FdfFile)\r
-        \r
+\r
         if Progress:\r
             Progress.Start("\nProcessing meta-data")\r
-        \r
+\r
         if self.FdfFile:\r
             #\r
             # Mark now build in AutoGen Phase\r
             #\r
-            GlobalData.gAutoGenPhase = True    \r
+            GlobalData.gAutoGenPhase = True\r
             Fdf = FdfParser(self.FdfFile.Path)\r
             Fdf.ParseFile()\r
             GlobalData.gFdfParser = Fdf\r
             GlobalData.gAutoGenPhase = False\r
             PcdSet = Fdf.Profile.PcdDict\r
+            if Fdf.CurrentFdName and Fdf.CurrentFdName in Fdf.Profile.FdDict:\r
+                FdDict = Fdf.Profile.FdDict[Fdf.CurrentFdName]\r
+                for FdRegion in FdDict.RegionList:\r
+                    if str(FdRegion.RegionType) is 'FILE' and self.Platform.VpdToolGuid in str(FdRegion.RegionDataList):\r
+                        if int(FdRegion.Offset) % 8 != 0:\r
+                            EdkLogger.error("build", FORMAT_INVALID, 'The VPD Base Address %s must be 8-byte aligned.' % (FdRegion.Offset))\r
             ModuleList = Fdf.Profile.InfList\r
             self.FdfProfile = Fdf.Profile\r
             for fvname in self.FvTargetList:\r
                 if fvname.upper() not in self.FdfProfile.FvDict:\r
                     EdkLogger.error("build", OPTION_VALUE_INVALID,\r
                                     "No such an FV in FDF file: %s" % fvname)\r
+\r
+            # In DSC file may use FILE_GUID to override the module, then in the Platform.Modules use FILE_GUIDmodule.inf as key,\r
+            # but the path (self.MetaFile.Path) is the real path\r
+            for key in self.FdfProfile.InfDict:\r
+                if key == 'ArchTBD':\r
+                    Platform_cache = {}\r
+                    MetaFile_cache = {}\r
+                    for Arch in self.ArchList:\r
+                        Platform_cache[Arch] = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
+                        MetaFile_cache[Arch] = []\r
+                        for Pkey in Platform_cache[Arch].Modules.keys():\r
+                            MetaFile_cache[Arch].append(Platform_cache[Arch].Modules[Pkey].MetaFile)\r
+                    for Inf in self.FdfProfile.InfDict[key]:\r
+                        ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)\r
+                        for Arch in self.ArchList:\r
+                            if ModuleFile in MetaFile_cache[Arch]:\r
+                                break\r
+                        else:\r
+                            ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]\r
+                            if not ModuleData.IsBinaryModule:\r
+                                EdkLogger.error('build', PARSER_ERROR, "Module %s NOT found in DSC file; Is it really a binary module?" % ModuleFile)\r
+\r
+                else:\r
+                    for Arch in self.ArchList:\r
+                        if Arch == key:\r
+                            Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
+                            MetaFileList = []\r
+                            for Pkey in Platform.Modules.keys():\r
+                                MetaFileList.append(Platform.Modules[Pkey].MetaFile)\r
+                            for Inf in self.FdfProfile.InfDict[key]:\r
+                                ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)\r
+                                if ModuleFile in MetaFileList:\r
+                                    continue\r
+                                ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]\r
+                                if not ModuleData.IsBinaryModule:\r
+                                    EdkLogger.error('build', PARSER_ERROR, "Module %s NOT found in DSC file; Is it really a binary module?" % ModuleFile)\r
+\r
         else:\r
             PcdSet = {}\r
             ModuleList = []\r
@@ -336,14 +394,156 @@ class WorkspaceAutoGen(AutoGen):
             if self.CapTargetList:\r
                 EdkLogger.info("No flash definition file found. Capsule [%s] will be ignored." % " ".join(self.CapTargetList))\r
                 self.CapTargetList = []\r
-        \r
+\r
         # apply SKU and inject PCDs from Flash Definition file\r
         for Arch in self.ArchList:\r
             Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
 \r
-            DecPcds = {}\r
-            DecPcdsKey = set()\r
+\r
+\r
+\r
+\r
+\r
+            SourcePcdDict = {'DynamicEx':[], 'PatchableInModule':[],'Dynamic':[],'FixedAtBuild':[]}\r
+            BinaryPcdDict = {'DynamicEx':[], 'PatchableInModule':[]}\r
+            SourcePcdDict_Keys = SourcePcdDict.keys()\r
+            BinaryPcdDict_Keys = BinaryPcdDict.keys()\r
+\r
+            # generate the SourcePcdDict and BinaryPcdDict\r
             PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
+            for BuildData in PGen.BuildDatabase._CACHE_.values():\r
+                if BuildData.Arch != Arch:\r
+                    continue\r
+                if BuildData.MetaFile.Ext == '.inf':\r
+                    for key in BuildData.Pcds:\r
+                        if BuildData.Pcds[key].Pending:\r
+                            if key in Platform.Pcds:\r
+                                PcdInPlatform = Platform.Pcds[key]\r
+                                if PcdInPlatform.Type not in [None, '']:\r
+                                    BuildData.Pcds[key].Type = PcdInPlatform.Type\r
+\r
+                            if BuildData.MetaFile in Platform.Modules:\r
+                                PlatformModule = Platform.Modules[str(BuildData.MetaFile)]\r
+                                if key in PlatformModule.Pcds:\r
+                                    PcdInPlatform = PlatformModule.Pcds[key]\r
+                                    if PcdInPlatform.Type not in [None, '']:\r
+                                        BuildData.Pcds[key].Type = PcdInPlatform.Type\r
+\r
+                        if 'DynamicEx' in BuildData.Pcds[key].Type:\r
+                            if BuildData.IsBinaryModule:\r
+                                if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) not in BinaryPcdDict['DynamicEx']:\r
+                                    BinaryPcdDict['DynamicEx'].append((BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName))\r
+                            else:\r
+                                if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) not in SourcePcdDict['DynamicEx']:\r
+                                    SourcePcdDict['DynamicEx'].append((BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName))\r
+\r
+                        elif 'PatchableInModule' in BuildData.Pcds[key].Type:\r
+                            if BuildData.MetaFile.Ext == '.inf':\r
+                                if BuildData.IsBinaryModule:\r
+                                    if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) not in BinaryPcdDict['PatchableInModule']:\r
+                                        BinaryPcdDict['PatchableInModule'].append((BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName))\r
+                                else:\r
+                                    if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) not in SourcePcdDict['PatchableInModule']:\r
+                                        SourcePcdDict['PatchableInModule'].append((BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName))\r
+\r
+                        elif 'Dynamic' in BuildData.Pcds[key].Type:\r
+                            if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) not in SourcePcdDict['Dynamic']:\r
+                                SourcePcdDict['Dynamic'].append((BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName))\r
+                        elif 'FixedAtBuild' in BuildData.Pcds[key].Type:\r
+                            if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) not in SourcePcdDict['FixedAtBuild']:\r
+                                SourcePcdDict['FixedAtBuild'].append((BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName))\r
+                else:\r
+                    pass\r
+            #\r
+            # A PCD can only use one type for all source modules\r
+            #\r
+            for i in SourcePcdDict_Keys:\r
+                for j in SourcePcdDict_Keys:\r
+                    if i != j:\r
+                        IntersectionList = list(set(SourcePcdDict[i]).intersection(set(SourcePcdDict[j])))\r
+                        if len(IntersectionList) > 0:\r
+                            EdkLogger.error(\r
+                            'build',\r
+                            FORMAT_INVALID,\r
+                            "Building modules from source INFs, following PCD use %s and %s access method. It must be corrected to use only one access method." % (i, j),\r
+                            ExtraData="%s" % '\n\t'.join([str(P[1]+'.'+P[0]) for P in IntersectionList])\r
+                            )\r
+                    else:\r
+                        pass\r
+\r
+            #\r
+            # intersection the BinaryPCD for Mixed PCD\r
+            #\r
+            for i in BinaryPcdDict_Keys:\r
+                for j in BinaryPcdDict_Keys:\r
+                    if i != j:\r
+                        IntersectionList = list(set(BinaryPcdDict[i]).intersection(set(BinaryPcdDict[j])))\r
+                        for item in IntersectionList:\r
+                            NewPcd1 = (item[0] + '_' + i, item[1])\r
+                            NewPcd2 = (item[0] + '_' + j, item[1])\r
+                            if item not in GlobalData.MixedPcd:\r
+                                GlobalData.MixedPcd[item] = [NewPcd1, NewPcd2]\r
+                            else:\r
+                                if NewPcd1 not in GlobalData.MixedPcd[item]:\r
+                                    GlobalData.MixedPcd[item].append(NewPcd1)\r
+                                if NewPcd2 not in GlobalData.MixedPcd[item]:\r
+                                    GlobalData.MixedPcd[item].append(NewPcd2)\r
+                    else:\r
+                        pass\r
+\r
+            #\r
+            # intersection the SourcePCD and BinaryPCD for Mixed PCD\r
+            #\r
+            for i in SourcePcdDict_Keys:\r
+                for j in BinaryPcdDict_Keys:\r
+                    if i != j:\r
+                        IntersectionList = list(set(SourcePcdDict[i]).intersection(set(BinaryPcdDict[j])))\r
+                        for item in IntersectionList:\r
+                            NewPcd1 = (item[0] + '_' + i, item[1])\r
+                            NewPcd2 = (item[0] + '_' + j, item[1])\r
+                            if item not in GlobalData.MixedPcd:\r
+                                GlobalData.MixedPcd[item] = [NewPcd1, NewPcd2]\r
+                            else:\r
+                                if NewPcd1 not in GlobalData.MixedPcd[item]:\r
+                                    GlobalData.MixedPcd[item].append(NewPcd1)\r
+                                if NewPcd2 not in GlobalData.MixedPcd[item]:\r
+                                    GlobalData.MixedPcd[item].append(NewPcd2)\r
+                    else:\r
+                        pass\r
+\r
+            for BuildData in PGen.BuildDatabase._CACHE_.values():\r
+                if BuildData.Arch != Arch:\r
+                    continue\r
+                for key in BuildData.Pcds:\r
+                    for SinglePcd in GlobalData.MixedPcd:\r
+                        if (BuildData.Pcds[key].TokenCName, BuildData.Pcds[key].TokenSpaceGuidCName) == SinglePcd:\r
+                            for item in GlobalData.MixedPcd[SinglePcd]:\r
+                                Pcd_Type = item[0].split('_')[-1]\r
+                                if (Pcd_Type == BuildData.Pcds[key].Type) or (Pcd_Type == TAB_PCDS_DYNAMIC_EX and BuildData.Pcds[key].Type in GenC.gDynamicExPcd) or \\r
+                                   (Pcd_Type == TAB_PCDS_DYNAMIC and BuildData.Pcds[key].Type in GenC.gDynamicPcd):\r
+                                    Value = BuildData.Pcds[key]\r
+                                    Value.TokenCName = BuildData.Pcds[key].TokenCName + '_' + Pcd_Type\r
+                                    if len(key) == 2:\r
+                                        newkey = (Value.TokenCName, key[1])\r
+                                    elif len(key) == 3:\r
+                                        newkey = (Value.TokenCName, key[1], key[2])\r
+                                    del BuildData.Pcds[key]\r
+                                    BuildData.Pcds[newkey] = Value\r
+                                    break\r
+                                else:\r
+                                    pass\r
+                            break\r
+                        else:\r
+                            pass\r
+\r
+            # handle the mixed pcd in FDF file\r
+            for key in PcdSet:\r
+                if key in GlobalData.MixedPcd:\r
+                    Value = PcdSet[key]\r
+                    del PcdSet[key]\r
+                    for item in GlobalData.MixedPcd[key]:\r
+                        PcdSet[item] = Value\r
+\r
             #Collect package set information from INF of FDF\r
             PkgSet = set()\r
             for Inf in ModuleList:\r
@@ -353,6 +553,8 @@ class WorkspaceAutoGen(AutoGen):
                 ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]\r
                 PkgSet.update(ModuleData.Packages)\r
             Pkgs = list(PkgSet) + list(PGen.PackageList)\r
+            DecPcds = {}\r
+            DecPcdsKey = set()\r
             for Pkg in Pkgs:\r
                 for Pcd in Pkg.Pcds:\r
                     DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd]\r
@@ -391,12 +593,20 @@ class WorkspaceAutoGen(AutoGen):
             Pa.CollectPlatformDynamicPcds()\r
             Pa.CollectFixedAtBuildPcds()\r
             self.AutoGenObjectList.append(Pa)\r
-        \r
+\r
+            #\r
+            # Generate Package level hash value\r
+            #\r
+            GlobalData.gPackageHash[Arch] = {}\r
+            if GlobalData.gUseHashCache:\r
+                for Pkg in Pkgs:\r
+                    self._GenPkgLevelHash(Pkg)\r
+\r
         #\r
         # Check PCDs token value conflict in each DEC file.\r
         #\r
         self._CheckAllPcdsTokenValueConflict()\r
-        \r
+\r
         #\r
         # Check PCD type and definition between DSC and DEC\r
         #\r
@@ -405,13 +615,148 @@ class WorkspaceAutoGen(AutoGen):
 #         if self.FdfFile:\r
 #             self._CheckDuplicateInFV(Fdf)\r
 \r
-        self._BuildDir = None\r
-        self._FvDir = None\r
-        self._MakeFileDir = None\r
-        self._BuildCommand = None\r
+        #\r
+        # Create BuildOptions Macro & PCD metafile, also add the Active Platform and FDF file.\r
+        #\r
+        content = 'gCommandLineDefines: '\r
+        content += str(GlobalData.gCommandLineDefines)\r
+        content += os.linesep\r
+        content += 'BuildOptionPcd: '\r
+        content += str(GlobalData.BuildOptionPcd)\r
+        content += os.linesep\r
+        content += 'Active Platform: '\r
+        content += str(self.Platform)\r
+        content += os.linesep\r
+        if self.FdfFile:\r
+            content += 'Flash Image Definition: '\r
+            content += str(self.FdfFile)\r
+            content += os.linesep\r
+        SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), content, False)\r
 \r
+        #\r
+        # Create PcdToken Number file for Dynamic/DynamicEx Pcd.\r
+        #\r
+        PcdTokenNumber = 'PcdTokenNumber: '\r
+        if Pa.PcdTokenNumber:\r
+            if Pa.DynamicPcdList:\r
+                for Pcd in Pa.DynamicPcdList:\r
+                    PcdTokenNumber += os.linesep\r
+                    PcdTokenNumber += str((Pcd.TokenCName, Pcd.TokenSpaceGuidCName))\r
+                    PcdTokenNumber += ' : '\r
+                    PcdTokenNumber += str(Pa.PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName])\r
+        SaveFileOnChange(os.path.join(self.BuildDir, 'PcdTokenNumber'), PcdTokenNumber, False)\r
+\r
+        #\r
+        # Get set of workspace metafiles\r
+        #\r
+        AllWorkSpaceMetaFiles = self._GetMetaFiles(Target, Toolchain, Arch)\r
+\r
+        #\r
+        # Retrieve latest modified time of all metafiles\r
+        #\r
+        SrcTimeStamp = 0\r
+        for f in AllWorkSpaceMetaFiles:\r
+            if os.stat(f)[8] > SrcTimeStamp:\r
+                SrcTimeStamp = os.stat(f)[8]\r
+        self._SrcTimeStamp = SrcTimeStamp\r
+\r
+        if GlobalData.gUseHashCache:\r
+            m = hashlib.md5()\r
+            for files in AllWorkSpaceMetaFiles:\r
+                if files.endswith('.dec'):\r
+                    continue\r
+                f = open(files, 'r')\r
+                Content = f.read()\r
+                f.close()\r
+                m.update(Content)\r
+            SaveFileOnChange(os.path.join(self.BuildDir, 'AutoGen.hash'), m.hexdigest(), True)\r
+            GlobalData.gPlatformHash = m.hexdigest()\r
+\r
+        #\r
+        # Write metafile list to build directory\r
+        #\r
+        AutoGenFilePath = os.path.join(self.BuildDir, 'AutoGen')\r
+        if os.path.exists (AutoGenFilePath):\r
+            os.remove(AutoGenFilePath)\r
+        if not os.path.exists(self.BuildDir):\r
+            os.makedirs(self.BuildDir)\r
+        with open(os.path.join(self.BuildDir, 'AutoGen'), 'w+') as file:\r
+            for f in AllWorkSpaceMetaFiles:\r
+                print >> file, f\r
         return True\r
 \r
+    def _GenPkgLevelHash(self, Pkg):\r
+        PkgDir = os.path.join(self.BuildDir, Pkg.Arch, Pkg.PackageName)\r
+        CreateDirectory(PkgDir)\r
+        HashFile = os.path.join(PkgDir, Pkg.PackageName + '.hash')\r
+        m = hashlib.md5()\r
+        # Get .dec file's hash value\r
+        f = open(Pkg.MetaFile.Path, 'r')\r
+        Content = f.read()\r
+        f.close()\r
+        m.update(Content)\r
+        # Get include files hash value\r
+        if Pkg.Includes:\r
+            for inc in Pkg.Includes:\r
+                for Root, Dirs, Files in os.walk(str(inc)):\r
+                    for File in Files:\r
+                        File_Path = os.path.join(Root, File)\r
+                        f = open(File_Path, 'r')\r
+                        Content = f.read()\r
+                        f.close()\r
+                        m.update(Content)\r
+        SaveFileOnChange(HashFile, m.hexdigest(), True)\r
+        if Pkg.PackageName not in GlobalData.gPackageHash[Pkg.Arch]:\r
+            GlobalData.gPackageHash[Pkg.Arch][Pkg.PackageName] = m.hexdigest()\r
+\r
+    def _GetMetaFiles(self, Target, Toolchain, Arch):\r
+        AllWorkSpaceMetaFiles = set()\r
+        #\r
+        # add fdf\r
+        #\r
+        if self.FdfFile:\r
+            AllWorkSpaceMetaFiles.add (self.FdfFile.Path)\r
+            if self.FdfFile:\r
+                FdfFiles = GlobalData.gFdfParser.GetAllIncludedFile()\r
+                for f in FdfFiles:\r
+                    AllWorkSpaceMetaFiles.add (f.FileName)\r
+        #\r
+        # add dsc\r
+        #\r
+        AllWorkSpaceMetaFiles.add(self.MetaFile.Path)\r
+\r
+        #\r
+        # add build_rule.txt & tools_def.txt\r
+        #\r
+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory, gDefaultBuildRuleFile))\r
+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory, gDefaultToolsDefFile))\r
+\r
+        # add BuildOption metafile\r
+        #\r
+        AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOptions'))\r
+\r
+        # add PcdToken Number file for Dynamic/DynamicEx Pcd\r
+        #\r
+        AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'PcdTokenNumber'))\r
+\r
+        for Arch in self.ArchList:\r
+            Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
+            PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
+\r
+            #\r
+            # add dec\r
+            #\r
+            for Package in PGen.PackageList:\r
+                AllWorkSpaceMetaFiles.add(Package.MetaFile.Path)\r
+\r
+            #\r
+            # add included dsc\r
+            #\r
+            for filePath in Platform._RawData.IncludedFiles:\r
+                AllWorkSpaceMetaFiles.add(filePath.Path)\r
+\r
+        return AllWorkSpaceMetaFiles\r
+\r
     ## _CheckDuplicateInFV() method\r
     #\r
     # Check whether there is duplicate modules/files exist in FV section. \r
@@ -425,7 +770,7 @@ class WorkspaceAutoGen(AutoGen):
                     #\r
                     # Get INF file GUID\r
                     #\r
-                    InfFoundFlag = False                   \r
+                    InfFoundFlag = False\r
                     for Pa in self.AutoGenObjectList:\r
                         if InfFoundFlag:\r
                             break\r
@@ -436,9 +781,9 @@ class WorkspaceAutoGen(AutoGen):
                                     _GuidDict[Module.Guid.upper()] = FfsFile\r
                                     break\r
                                 else:\r
-                                    EdkLogger.error("build", \r
+                                    EdkLogger.error("build",\r
                                                     FORMAT_INVALID,\r
-                                                    "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s"%(FfsFile.CurrentLineNum,\r
+                                                    "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum,\r
                                                                                                                                    FfsFile.CurrentLineContent,\r
                                                                                                                                    _GuidDict[Module.Guid.upper()].CurrentLineNum,\r
                                                                                                                                    _GuidDict[Module.Guid.upper()].CurrentLineContent,\r
@@ -452,7 +797,7 @@ class WorkspaceAutoGen(AutoGen):
                             InfPath = NormPath(FfsFile.InfFileName)\r
                             if not os.path.exists(InfPath):\r
                                 EdkLogger.error('build', GENFDS_ERROR, "Non-existant Module %s !" % (FfsFile.InfFileName))\r
-                                \r
+\r
                             PathClassObj = PathClass(FfsFile.InfFileName, self.WorkspaceDir)\r
                             #\r
                             # Here we just need to get FILE_GUID from INF file, use 'COMMON' as ARCH attribute. and use \r
@@ -462,19 +807,19 @@ class WorkspaceAutoGen(AutoGen):
                             if not InfObj.Guid.upper() in _GuidDict.keys():\r
                                 _GuidDict[InfObj.Guid.upper()] = FfsFile\r
                             else:\r
-                                EdkLogger.error("build", \r
+                                EdkLogger.error("build",\r
                                                 FORMAT_INVALID,\r
-                                                "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s"%(FfsFile.CurrentLineNum,\r
+                                                "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum,\r
                                                                                                                                FfsFile.CurrentLineContent,\r
                                                                                                                                _GuidDict[InfObj.Guid.upper()].CurrentLineNum,\r
                                                                                                                                _GuidDict[InfObj.Guid.upper()].CurrentLineContent,\r
                                                                                                                                InfObj.Guid.upper()),\r
                                                 ExtraData=self.FdfFile)\r
                         InfFoundFlag = False\r
-                                                                   \r
+\r
                 if FfsFile.NameGuid != None:\r
                     _CheckPCDAsGuidPattern = re.compile("^PCD\(.+\..+\)$")\r
-                    \r
+\r
                     #\r
                     # If the NameGuid reference a PCD name. \r
                     # The style must match: PCD(xxxx.yyy)\r
@@ -493,51 +838,51 @@ class WorkspaceAutoGen(AutoGen):
                                         # First convert from CFormatGuid to GUID string\r
                                         #\r
                                         _PcdGuidString = GuidStructureStringToGuidString(PcdItem.DefaultValue)\r
-                                        \r
+\r
                                         if not _PcdGuidString:\r
                                             #\r
                                             # Then try Byte array.\r
                                             #\r
                                             _PcdGuidString = GuidStructureByteArrayToGuidString(PcdItem.DefaultValue)\r
-                                            \r
+\r
                                         if not _PcdGuidString:\r
                                             #\r
                                             # Not Byte array or CFormat GUID, raise error.\r
                                             #\r
                                             EdkLogger.error("build",\r
                                                             FORMAT_INVALID,\r
-                                                            "The format of PCD value is incorrect. PCD: %s , Value: %s\n"%(_PcdName, PcdItem.DefaultValue),\r
+                                                            "The format of PCD value is incorrect. PCD: %s , Value: %s\n" % (_PcdName, PcdItem.DefaultValue),\r
                                                             ExtraData=self.FdfFile)\r
-                                        \r
-                                        if not _PcdGuidString.upper() in _GuidDict.keys():    \r
+\r
+                                        if not _PcdGuidString.upper() in _GuidDict.keys():\r
                                             _GuidDict[_PcdGuidString.upper()] = FfsFile\r
                                             PcdFoundFlag = True\r
                                             break\r
                                         else:\r
-                                            EdkLogger.error("build", \r
+                                            EdkLogger.error("build",\r
                                                             FORMAT_INVALID,\r
-                                                            "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s"%(FfsFile.CurrentLineNum,\r
+                                                            "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum,\r
                                                                                                                                            FfsFile.CurrentLineContent,\r
                                                                                                                                            _GuidDict[_PcdGuidString.upper()].CurrentLineNum,\r
                                                                                                                                            _GuidDict[_PcdGuidString.upper()].CurrentLineContent,\r
                                                                                                                                            FfsFile.NameGuid.upper()),\r
-                                                            ExtraData=self.FdfFile)                                                                       \r
-                \r
+                                                            ExtraData=self.FdfFile)\r
+\r
                     if not FfsFile.NameGuid.upper() in _GuidDict.keys():\r
                         _GuidDict[FfsFile.NameGuid.upper()] = FfsFile\r
                     else:\r
                         #\r
                         # Two raw file GUID conflict.\r
                         #\r
-                        EdkLogger.error("build", \r
+                        EdkLogger.error("build",\r
                                         FORMAT_INVALID,\r
-                                        "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s"%(FfsFile.CurrentLineNum,\r
+                                        "Duplicate GUID found for these lines: Line %d: %s and Line %d: %s. GUID: %s" % (FfsFile.CurrentLineNum,\r
                                                                                                                        FfsFile.CurrentLineContent,\r
                                                                                                                        _GuidDict[FfsFile.NameGuid.upper()].CurrentLineNum,\r
                                                                                                                        _GuidDict[FfsFile.NameGuid.upper()].CurrentLineContent,\r
                                                                                                                        FfsFile.NameGuid.upper()),\r
                                         ExtraData=self.FdfFile)\r
-                \r
+\r
 \r
     def _CheckPcdDefineAndType(self):\r
         PcdTypeList = [\r
@@ -552,17 +897,17 @@ class WorkspaceAutoGen(AutoGen):
             # Key of DSC's Pcds dictionary is PcdCName, TokenSpaceGuid\r
             for Pcd in Pa.Platform.Pcds:\r
                 PcdType = Pa.Platform.Pcds[Pcd].Type\r
-                \r
+\r
                 # If no PCD type, this PCD comes from FDF \r
                 if not PcdType:\r
                     continue\r
-                \r
+\r
                 # Try to remove Hii and Vpd suffix\r
                 if PcdType.startswith("DynamicEx"):\r
                     PcdType = "DynamicEx"\r
                 elif PcdType.startswith("Dynamic"):\r
                     PcdType = "Dynamic"\r
-    \r
+\r
                 for Package in Pa.PackageList:\r
                     # Key of DEC's Pcds dictionary is PcdCName, TokenSpaceGuid, PcdType\r
                     if (Pcd[0], Pcd[1], PcdType) in Package.Pcds:\r
@@ -600,7 +945,8 @@ class WorkspaceAutoGen(AutoGen):
 \r
     ## Return the directory to store all intermediate and final files built\r
     def _GetBuildDir(self):\r
-        return self.AutoGenObjectList[0].BuildDir\r
+        if self._BuildDir == None:\r
+            return self.AutoGenObjectList[0].BuildDir\r
 \r
     ## Return the build output directory platform specifies\r
     def _GetOutputDir(self):\r
@@ -640,7 +986,7 @@ class WorkspaceAutoGen(AutoGen):
             # BuildCommand should be all the same. So just get one from platform AutoGen\r
             self._BuildCommand = self.AutoGenObjectList[0].BuildCommand\r
         return self._BuildCommand\r
-    \r
+\r
     ## Check the PCDs token value conflict in each DEC file.\r
     #\r
     # Will cause build break and raise error message while two PCDs conflict.\r
@@ -672,30 +1018,36 @@ class WorkspaceAutoGen(AutoGen):
                         #\r
                         # Sort same token value PCD list with TokenGuid and TokenCName\r
                         #\r
-                        SameTokenValuePcdList.sort(lambda x, y: cmp("%s.%s"%(x.TokenSpaceGuidCName, x.TokenCName), "%s.%s"%(y.TokenSpaceGuidCName, y.TokenCName))) \r
-                        SameTokenValuePcdListCount = 0     \r
+                        SameTokenValuePcdList.sort(lambda x, y: cmp("%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName), "%s.%s" % (y.TokenSpaceGuidCName, y.TokenCName)))\r
+                        SameTokenValuePcdListCount = 0\r
                         while (SameTokenValuePcdListCount < len(SameTokenValuePcdList) - 1):\r
-                            TemListItem     = SameTokenValuePcdList[SameTokenValuePcdListCount]\r
-                            TemListItemNext = SameTokenValuePcdList[SameTokenValuePcdListCount + 1] \r
-                                                                                                      \r
+                            Flag = False\r
+                            TemListItem = SameTokenValuePcdList[SameTokenValuePcdListCount]\r
+                            TemListItemNext = SameTokenValuePcdList[SameTokenValuePcdListCount + 1]\r
+\r
                             if (TemListItem.TokenSpaceGuidCName == TemListItemNext.TokenSpaceGuidCName) and (TemListItem.TokenCName != TemListItemNext.TokenCName):\r
-                                EdkLogger.error(\r
-                                            'build',\r
-                                            FORMAT_INVALID,\r
-                                            "The TokenValue [%s] of PCD [%s.%s] is conflict with: [%s.%s] in %s"\\r
-                                            % (TemListItem.TokenValue, TemListItem.TokenSpaceGuidCName, TemListItem.TokenCName, TemListItemNext.TokenSpaceGuidCName, TemListItemNext.TokenCName, Package),\r
-                                            ExtraData=None\r
-                                            )\r
+                                for PcdItem in GlobalData.MixedPcd:\r
+                                    if (TemListItem.TokenCName, TemListItem.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem] or \\r
+                                        (TemListItemNext.TokenCName, TemListItemNext.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
+                                        Flag = True\r
+                                if not Flag:\r
+                                    EdkLogger.error(\r
+                                                'build',\r
+                                                FORMAT_INVALID,\r
+                                                "The TokenValue [%s] of PCD [%s.%s] is conflict with: [%s.%s] in %s"\\r
+                                                % (TemListItem.TokenValue, TemListItem.TokenSpaceGuidCName, TemListItem.TokenCName, TemListItemNext.TokenSpaceGuidCName, TemListItemNext.TokenCName, Package),\r
+                                                ExtraData=None\r
+                                                )\r
                             SameTokenValuePcdListCount += 1\r
                         Count += SameTokenValuePcdListCount\r
                     Count += 1\r
-                \r
+\r
                 PcdList = Package.Pcds.values()\r
-                PcdList.sort(lambda x, y: cmp("%s.%s"%(x.TokenSpaceGuidCName, x.TokenCName), "%s.%s"%(y.TokenSpaceGuidCName, y.TokenCName)))\r
+                PcdList.sort(lambda x, y: cmp("%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName), "%s.%s" % (y.TokenSpaceGuidCName, y.TokenCName)))\r
                 Count = 0\r
                 while (Count < len(PcdList) - 1) :\r
                     Item = PcdList[Count]\r
-                    ItemNext = PcdList[Count + 1]                \r
+                    ItemNext = PcdList[Count + 1]\r
                     #\r
                     # Check PCDs with same TokenSpaceGuidCName.TokenCName have same token value as well.\r
                     #\r
@@ -760,12 +1112,21 @@ class WorkspaceAutoGen(AutoGen):
 #  file in order to generate makefile for platform.\r
 #\r
 class PlatformAutoGen(AutoGen):\r
+    # call super().__init__ then call the worker function with different parameter count\r
+    def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
+        try:\r
+            self._Init\r
+        except:\r
+            super(PlatformAutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch)\r
+            self._Init = True\r
     #\r
     # Used to store all PCDs for both PEI and DXE phase, in order to generate \r
     # correct PCD database\r
     # \r
     _DynaPcdList_ = []\r
     _NonDynaPcdList_ = []\r
+    _PlatformPcds = {}\r
     \r
     #\r
     # The priority list while override build option \r
@@ -786,12 +1147,9 @@ class PlatformAutoGen(AutoGen):
                 "0x01001"  : 3,      #  ******_TOOLCHAIN_****_***********_ATTRIBUTE\r
                 "0x10001"  : 2,      #  TARGET_*********_****_***********_ATTRIBUTE\r
                 "0x00001"  : 1}      #  ******_*********_****_***********_ATTRIBUTE (Lowest)\r
-    \r
-    ## The real constructor of PlatformAutoGen\r
+\r
+    ## Initialize PlatformAutoGen\r
     #\r
-    #  This method is not supposed to be called by users of PlatformAutoGen. It's\r
-    #  only used by factory method __new__() to do real initialization work for an\r
-    #  object of PlatformAutoGen\r
     #\r
     #   @param      Workspace       WorkspaceAutoGen object\r
     #   @param      PlatformFile    Platform file (DSC file)\r
@@ -799,7 +1157,7 @@ class PlatformAutoGen(AutoGen):
     #   @param      Toolchain       Name of tool chain\r
     #   @param      Arch            arch of the platform supports\r
     #\r
-    def _Init(self, Workspace, PlatformFile, Target, Toolchain, Arch):\r
+    def _InitWorker(self, Workspace, PlatformFile, Target, Toolchain, Arch):\r
         EdkLogger.debug(EdkLogger.DEBUG_9, "AutoGen platform [%s] [%s]" % (PlatformFile, Arch))\r
         GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (PlatformFile, Arch, Toolchain, Target)\r
 \r
@@ -816,6 +1174,8 @@ class PlatformAutoGen(AutoGen):
         self.AllPcdList = []\r
         # get the original module/package/platform objects\r
         self.BuildDatabase = Workspace.BuildDatabase\r
+        self.DscBuildDataObj = Workspace.Platform\r
+        self._GuidDict = Workspace._GuidDict\r
 \r
         # flag indicating if the makefile/C-code file has been created or not\r
         self.IsMakeFileCreated  = False\r
@@ -852,6 +1212,9 @@ class PlatformAutoGen(AutoGen):
         self._BuildCommand = None\r
         self._AsBuildInfList = []\r
         self._AsBuildModuleList = []\r
+\r
+        self.VariableInfo = None\r
+\r
         if GlobalData.gFdfParser != None:\r
             self._AsBuildInfList = GlobalData.gFdfParser.Profile.InfList\r
             for Inf in self._AsBuildInfList:\r
@@ -863,6 +1226,7 @@ class PlatformAutoGen(AutoGen):
         # get library/modules for build\r
         self.LibraryBuildDirectoryList = []\r
         self.ModuleBuildDirectoryList = []\r
+\r
         return True\r
 \r
     def __repr__(self):\r
@@ -890,18 +1254,21 @@ class PlatformAutoGen(AutoGen):
     ## Generate Fds Command\r
     def _GenFdsCommand(self):\r
         return self.Workspace.GenFdsCommand\r
-               \r
+\r
     ## Create makefile for the platform and mdoules in it\r
     #\r
     #   @param      CreateModuleMakeFile    Flag indicating if the makefile for\r
     #                                       modules will be created as well\r
     #\r
-    def CreateMakeFile(self, CreateModuleMakeFile=False):\r
+    def CreateMakeFile(self, CreateModuleMakeFile=False, FfsCommand = {}):\r
         if CreateModuleMakeFile:\r
             for ModuleFile in self.Platform.Modules:\r
                 Ma = ModuleAutoGen(self.Workspace, ModuleFile, self.BuildTarget,\r
                                    self.ToolChain, self.Arch, self.MetaFile)\r
-                Ma.CreateMakeFile(True)\r
+                if (ModuleFile.File, self.Arch) in FfsCommand:\r
+                    Ma.CreateMakeFile(True, FfsCommand[ModuleFile.File, self.Arch])\r
+                else:\r
+                    Ma.CreateMakeFile(True)\r
                 #Ma.CreateAsBuiltInf()\r
 \r
         # no need to create makefile for the platform more than once\r
@@ -941,12 +1308,95 @@ class PlatformAutoGen(AutoGen):
                 if key in ShareFixedAtBuildPcdsSameValue and ShareFixedAtBuildPcdsSameValue[key]:                    \r
                     LibAuto.ConstPcd[key] = Pcd.DefaultValue\r
 \r
+    def CollectVariables(self, DynamicPcdSet):\r
+\r
+        VpdRegionSize = 0\r
+        VpdRegionBase = 0\r
+        if self.Workspace.FdfFile:\r
+            FdDict = self.Workspace.FdfProfile.FdDict[GlobalData.gFdfParser.CurrentFdName]\r
+            for FdRegion in FdDict.RegionList:\r
+                for item in FdRegion.RegionDataList:\r
+                    if self.Platform.VpdToolGuid.strip() and self.Platform.VpdToolGuid in item:\r
+                        VpdRegionSize = FdRegion.Size\r
+                        VpdRegionBase = FdRegion.Offset\r
+                        break\r
+\r
+\r
+        VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(),self.DscBuildDataObj._GetSkuIds())\r
+        VariableInfo.SetVpdRegionMaxSize(VpdRegionSize)\r
+        VariableInfo.SetVpdRegionOffset(VpdRegionBase)\r
+        Index = 0\r
+        for Pcd in DynamicPcdSet:\r
+            pcdname = ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName))\r
+            for SkuName in Pcd.SkuInfoList:\r
+                Sku = Pcd.SkuInfoList[SkuName]\r
+                SkuId = Sku.SkuId\r
+                if SkuId == None or SkuId == '':\r
+                    continue\r
+                if len(Sku.VariableName) > 0:\r
+                    VariableGuidStructure = Sku.VariableGuidValue\r
+                    VariableGuid = GuidStructureStringToGuidString(VariableGuidStructure)\r
+                    for StorageName in Sku.DefaultStoreDict:\r
+                        VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableOffset, Sku.VariableAttribute , Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType))\r
+            Index += 1\r
+        return VariableInfo\r
+\r
+    def UpdateNVStoreMaxSize(self,OrgVpdFile):\r
+        if self.VariableInfo:\r
+            VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)\r
+            PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if item.TokenCName == "PcdNvStoreDefaultValueBuffer" and item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]\r
+\r
+            if PcdNvStoreDfBuffer:\r
+                if os.path.exists(VpdMapFilePath):\r
+                    OrgVpdFile.Read(VpdMapFilePath)\r
+                    PcdItems = OrgVpdFile.GetOffset(PcdNvStoreDfBuffer[0])\r
+                    NvStoreOffset = PcdItems.values()[0].strip() if PcdItems else '0'\r
+                else:\r
+                    EdkLogger.error("build", FILE_READ_FAILURE, "Can not find VPD map file %s to fix up VPD offset." % VpdMapFilePath)\r
+\r
+                NvStoreOffset = int(NvStoreOffset,16) if NvStoreOffset.upper().startswith("0X") else int(NvStoreOffset)\r
+                default_skuobj = PcdNvStoreDfBuffer[0].SkuInfoList.get("DEFAULT")\r
+                maxsize = self.VariableInfo.VpdRegionSize  - NvStoreOffset if self.VariableInfo.VpdRegionSize else len(default_skuobj.DefaultValue.split(","))\r
+                var_data = self.VariableInfo.PatchNVStoreDefaultMaxSize(maxsize)\r
+\r
+                if var_data and default_skuobj:\r
+                    default_skuobj.DefaultValue = var_data\r
+                    PcdNvStoreDfBuffer[0].DefaultValue = var_data\r
+                    PcdNvStoreDfBuffer[0].SkuInfoList.clear()\r
+                    PcdNvStoreDfBuffer[0].SkuInfoList['DEFAULT'] = default_skuobj\r
+                    PcdNvStoreDfBuffer[0].MaxDatumSize = str(len(default_skuobj.DefaultValue.split(",")))\r
+\r
+        return OrgVpdFile\r
+\r
     ## Collect dynamic PCDs\r
     #\r
     #  Gather dynamic PCDs list from each module and their settings from platform\r
     #  This interface should be invoked explicitly when platform action is created.\r
     #\r
     def CollectPlatformDynamicPcds(self):\r
+\r
+        for key in self.Platform.Pcds:\r
+            for SinglePcd in GlobalData.MixedPcd:\r
+                if (self.Platform.Pcds[key].TokenCName, self.Platform.Pcds[key].TokenSpaceGuidCName) == SinglePcd:\r
+                    for item in GlobalData.MixedPcd[SinglePcd]:\r
+                        Pcd_Type = item[0].split('_')[-1]\r
+                        if (Pcd_Type == self.Platform.Pcds[key].Type) or (Pcd_Type == TAB_PCDS_DYNAMIC_EX and self.Platform.Pcds[key].Type in GenC.gDynamicExPcd) or \\r
+                           (Pcd_Type == TAB_PCDS_DYNAMIC and self.Platform.Pcds[key].Type in GenC.gDynamicPcd):\r
+                            Value = self.Platform.Pcds[key]\r
+                            Value.TokenCName = self.Platform.Pcds[key].TokenCName + '_' + Pcd_Type\r
+                            if len(key) == 2:\r
+                                newkey = (Value.TokenCName, key[1])\r
+                            elif len(key) == 3:\r
+                                newkey = (Value.TokenCName, key[1], key[2])\r
+                            del self.Platform.Pcds[key]\r
+                            self.Platform.Pcds[newkey] = Value\r
+                            break\r
+                        else:\r
+                            pass\r
+                    break\r
+                else:\r
+                    pass\r
+\r
         # for gathering error information\r
         NoDatumTypePcdList = set()\r
         PcdNotInDb = []\r
@@ -960,8 +1410,8 @@ class PlatformAutoGen(AutoGen):
             #GuidValue.update(M.Guids)\r
             \r
             self.Platform.Modules[F].M = M\r
-            \r
-            for PcdFromModule in M.ModulePcdList+M.LibraryPcdList:\r
+\r
+            for PcdFromModule in M.ModulePcdList + M.LibraryPcdList:\r
                 # make sure that the "VOID*" kind of datum has MaxDatumSize set\r
                 if PcdFromModule.DatumType == "VOID*" and PcdFromModule.MaxDatumSize in [None, '']:\r
                     NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, F))\r
@@ -1101,58 +1551,108 @@ class PlatformAutoGen(AutoGen):
         #\r
         # The reason of sorting is make sure the unicode string is in double-byte alignment in string table.\r
         #\r
-        UnicodePcdArray = []\r
-        HiiPcdArray     = []\r
-        OtherPcdArray   = []\r
+        UnicodePcdArray = set()\r
+        HiiPcdArray     = set()\r
+        OtherPcdArray   = set()\r
         VpdPcdDict      = {}\r
         VpdFile               = VpdInfoFile.VpdInfoFile()\r
-        NeedProcessVpdMapFile = False                    \r
-        \r
+        NeedProcessVpdMapFile = False\r
+\r
+        for pcd in self.Platform.Pcds.keys():\r
+            if pcd not in self._PlatformPcds.keys():\r
+                self._PlatformPcds[pcd] = self.Platform.Pcds[pcd]\r
+\r
+        for item in self._PlatformPcds:\r
+            if self._PlatformPcds[item].DatumType and self._PlatformPcds[item].DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
+                self._PlatformPcds[item].DatumType = "VOID*"\r
+\r
         if (self.Workspace.ArchList[-1] == self.Arch): \r
             for Pcd in self._DynamicPcdList:\r
                 # just pick the a value to determine whether is unicode string type\r
-                Sku      = Pcd.SkuInfoList[Pcd.SkuInfoList.keys()[0]]\r
+                Sku = Pcd.SkuInfoList[Pcd.SkuInfoList.keys()[0]]\r
                 Sku.VpdOffset = Sku.VpdOffset.strip()\r
-                \r
-                PcdValue = Sku.DefaultValue\r
-                if Pcd.DatumType == 'VOID*' and PcdValue.startswith("L"):\r
+\r
+                if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
+                    Pcd.DatumType = "VOID*"\r
+\r
                     # if found PCD which datum value is unicode string the insert to left size of UnicodeIndex\r
-                    UnicodePcdArray.append(Pcd)\r
-                elif len(Sku.VariableName) > 0:\r
                     # if found HII type PCD then insert to right of UnicodeIndex\r
-                    HiiPcdArray.append(Pcd)\r
-                else:\r
-                    OtherPcdArray.append(Pcd)\r
                 if Pcd.Type in [TAB_PCDS_DYNAMIC_VPD, TAB_PCDS_DYNAMIC_EX_VPD]:\r
-                    VpdPcdDict[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName)] = Pcd                   \r
-            \r
-            PlatformPcds = self.Platform.Pcds.keys()\r
-            PlatformPcds.sort()            \r
+                    VpdPcdDict[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName)] = Pcd\r
+\r
+            #Collect DynamicHii PCD values and assign it to DynamicExVpd PCD gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer\r
+            PcdNvStoreDfBuffer = VpdPcdDict.get(("PcdNvStoreDefaultValueBuffer","gEfiMdeModulePkgTokenSpaceGuid"))\r
+            if PcdNvStoreDfBuffer:\r
+                self.VariableInfo = self.CollectVariables(self._DynamicPcdList)\r
+                vardump = self.VariableInfo.dump()\r
+                if vardump:\r
+                    PcdNvStoreDfBuffer.DefaultValue = vardump\r
+                    for skuname in PcdNvStoreDfBuffer.SkuInfoList:\r
+                        PcdNvStoreDfBuffer.SkuInfoList[skuname].DefaultValue = vardump\r
+                        PcdNvStoreDfBuffer.MaxDatumSize = str(len(vardump.split(",")))\r
+\r
+            PlatformPcds = self._PlatformPcds.keys()\r
+            PlatformPcds.sort()\r
             #\r
             # Add VPD type PCD into VpdFile and determine whether the VPD PCD need to be fixed up.\r
             #\r
+            VpdSkuMap = {}\r
             for PcdKey in PlatformPcds:\r
-                Pcd = self.Platform.Pcds[PcdKey]\r
+                Pcd = self._PlatformPcds[PcdKey]\r
                 if Pcd.Type in [TAB_PCDS_DYNAMIC_VPD, TAB_PCDS_DYNAMIC_EX_VPD] and \\r
                    PcdKey in VpdPcdDict:\r
                     Pcd = VpdPcdDict[PcdKey]\r
+                    SkuValueMap = {}\r
+                    DefaultSku = Pcd.SkuInfoList.get('DEFAULT')\r
+                    if DefaultSku:\r
+                        PcdValue = DefaultSku.DefaultValue\r
+                        if PcdValue not in SkuValueMap:\r
+                            SkuValueMap[PcdValue] = []\r
+                            VpdFile.Add(Pcd, 'DEFAULT',DefaultSku.VpdOffset)\r
+                        SkuValueMap[PcdValue].append(DefaultSku)\r
+\r
                     for (SkuName,Sku) in Pcd.SkuInfoList.items():\r
                         Sku.VpdOffset = Sku.VpdOffset.strip()\r
-                        VpdFile.Add(Pcd, Sku.VpdOffset)\r
+                        PcdValue = Sku.DefaultValue\r
+                        if PcdValue == "":\r
+                            PcdValue  = Pcd.DefaultValue\r
+                        if Sku.VpdOffset != '*':\r
+                            if PcdValue.startswith("{"):\r
+                                Alignment = 8\r
+                            elif PcdValue.startswith("L"):\r
+                                Alignment = 2\r
+                            else:\r
+                                Alignment = 1\r
+                            try:\r
+                                VpdOffset = int(Sku.VpdOffset)\r
+                            except:\r
+                                try:\r
+                                    VpdOffset = int(Sku.VpdOffset, 16)\r
+                                except:\r
+                                    EdkLogger.error("build", FORMAT_INVALID, "Invalid offset value %s for PCD %s.%s." % (Sku.VpdOffset, Pcd.TokenSpaceGuidCName, Pcd.TokenCName))\r
+                            if VpdOffset % Alignment != 0:\r
+                                if PcdValue.startswith("{"):\r
+                                    EdkLogger.warn("build", "The offset value of PCD %s.%s is not 8-byte aligned!" %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName), File=self.MetaFile)\r
+                                else:\r
+                                    EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Alignment))\r
+                        if PcdValue not in SkuValueMap:\r
+                            SkuValueMap[PcdValue] = []\r
+                            VpdFile.Add(Pcd, SkuName,Sku.VpdOffset)\r
+                        SkuValueMap[PcdValue].append(Sku)\r
                         # if the offset of a VPD is *, then it need to be fixed up by third party tool.\r
                         if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
                             NeedProcessVpdMapFile = True\r
                             if self.Platform.VpdToolGuid == None or self.Platform.VpdToolGuid == '':\r
                                 EdkLogger.error("Build", FILE_NOT_FOUND, \\r
                                                 "Fail to find third-party BPDG tool to process VPD PCDs. BPDG Guid tool need to be defined in tools_def.txt and VPD_TOOL_GUID need to be provided in DSC file.")\r
-                            \r
-                                   \r
+\r
+                    VpdSkuMap[PcdKey] = SkuValueMap\r
             #\r
             # Fix the PCDs define in VPD PCD section that never referenced by module.\r
             # An example is PCD for signature usage.\r
             #            \r
             for DscPcd in PlatformPcds:\r
-                DscPcdEntry = self.Platform.Pcds[DscPcd]\r
+                DscPcdEntry = self._PlatformPcds[DscPcd]\r
                 if DscPcdEntry.Type in [TAB_PCDS_DYNAMIC_VPD, TAB_PCDS_DYNAMIC_EX_VPD]:\r
                     if not (self.Platform.VpdToolGuid == None or self.Platform.VpdToolGuid == ''):\r
                         FoundFlag = False\r
@@ -1161,11 +1661,17 @@ class PlatformAutoGen(AutoGen):
                             if (VpdPcd.TokenSpaceGuidCName == DscPcdEntry.TokenSpaceGuidCName) and \\r
                                (VpdPcd.TokenCName == DscPcdEntry.TokenCName):\r
                                     FoundFlag = True\r
-                        \r
+\r
                         # Not found, it should be signature\r
                         if not FoundFlag :\r
                             # just pick the a value to determine whether is unicode string type\r
-                            for (SkuName,Sku) in DscPcdEntry.SkuInfoList.items():\r
+                            SkuValueMap = {}\r
+                            SkuObjList = DscPcdEntry.SkuInfoList.items()\r
+                            DefaultSku = DscPcdEntry.SkuInfoList.get('DEFAULT')\r
+                            if DefaultSku:\r
+                                defaultindex = SkuObjList.index(('DEFAULT',DefaultSku))\r
+                                SkuObjList[0],SkuObjList[defaultindex] = SkuObjList[defaultindex],SkuObjList[0]\r
+                            for (SkuName,Sku) in SkuObjList:\r
                                 Sku.VpdOffset = Sku.VpdOffset.strip() \r
                                 \r
                                 # Need to iterate DEC pcd information to get the value & datumtype\r
@@ -1190,82 +1696,132 @@ class PlatformAutoGen(AutoGen):
                                                                                                                     \r
                                 if DscPcdEntry not in self._DynamicPcdList:\r
                                     self._DynamicPcdList.append(DscPcdEntry)\r
-#                                Sku = DscPcdEntry.SkuInfoList[DscPcdEntry.SkuInfoList.keys()[0]]\r
                                 Sku.VpdOffset = Sku.VpdOffset.strip()\r
                                 PcdValue = Sku.DefaultValue\r
-                                VpdFile.Add(DscPcdEntry, Sku.VpdOffset)\r
+                                if PcdValue == "":\r
+                                    PcdValue  = DscPcdEntry.DefaultValue\r
+                                if Sku.VpdOffset != '*':\r
+                                    if PcdValue.startswith("{"):\r
+                                        Alignment = 8\r
+                                    elif PcdValue.startswith("L"):\r
+                                        Alignment = 2\r
+                                    else:\r
+                                        Alignment = 1\r
+                                    try:\r
+                                        VpdOffset = int(Sku.VpdOffset)\r
+                                    except:\r
+                                        try:\r
+                                            VpdOffset = int(Sku.VpdOffset, 16)\r
+                                        except:\r
+                                            EdkLogger.error("build", FORMAT_INVALID, "Invalid offset value %s for PCD %s.%s." % (Sku.VpdOffset, DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName))\r
+                                    if VpdOffset % Alignment != 0:\r
+                                        if PcdValue.startswith("{"):\r
+                                            EdkLogger.warn("build", "The offset value of PCD %s.%s is not 8-byte aligned!" %(DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName), File=self.MetaFile)\r
+                                        else:\r
+                                            EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName, Alignment))\r
+                                if PcdValue not in SkuValueMap:\r
+                                    SkuValueMap[PcdValue] = []\r
+                                    VpdFile.Add(DscPcdEntry, SkuName,Sku.VpdOffset)\r
+                                SkuValueMap[PcdValue].append(Sku)\r
                                 if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
                                     NeedProcessVpdMapFile = True \r
                             if DscPcdEntry.DatumType == 'VOID*' and PcdValue.startswith("L"):\r
-                                UnicodePcdArray.append(DscPcdEntry)\r
+                                UnicodePcdArray.add(DscPcdEntry)\r
                             elif len(Sku.VariableName) > 0:\r
-                                HiiPcdArray.append(DscPcdEntry)\r
+                                HiiPcdArray.add(DscPcdEntry)\r
                             else:\r
-                                OtherPcdArray.append(DscPcdEntry)\r
-                                \r
+                                OtherPcdArray.add(DscPcdEntry)\r
+\r
                                 # if the offset of a VPD is *, then it need to be fixed up by third party tool.\r
-                                                       \r
-                    \r
-                    \r
+                            VpdSkuMap[DscPcd] = SkuValueMap\r
             if (self.Platform.FlashDefinition == None or self.Platform.FlashDefinition == '') and \\r
                VpdFile.GetCount() != 0:\r
                 EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, \r
                                 "Fail to get FLASH_DEFINITION definition in DSC file %s which is required when DSC contains VPD PCD." % str(self.Platform.MetaFile))\r
-            \r
+\r
             if VpdFile.GetCount() != 0:\r
-                DscTimeStamp = self.Platform.MetaFile.TimeStamp\r
-                FvPath = os.path.join(self.BuildDir, "FV")\r
-                if not os.path.exists(FvPath):\r
-                    try:\r
-                        os.makedirs(FvPath)\r
-                    except:\r
-                        EdkLogger.error("build", FILE_WRITE_FAILURE, "Fail to create FV folder under %s" % self.BuildDir)\r
-                        \r
-        \r
-                VpdFilePath = os.path.join(FvPath, "%s.txt" % self.Platform.VpdToolGuid)\r
 \r
-                \r
-                if not os.path.exists(VpdFilePath) or os.path.getmtime(VpdFilePath) < DscTimeStamp:\r
-                    VpdFile.Write(VpdFilePath)\r
-        \r
-                    # retrieve BPDG tool's path from tool_def.txt according to VPD_TOOL_GUID defined in DSC file.\r
-                    BPDGToolName = None\r
-                    for ToolDef in self.ToolDefinition.values():\r
-                        if ToolDef.has_key("GUID") and ToolDef["GUID"] == self.Platform.VpdToolGuid:\r
-                            if not ToolDef.has_key("PATH"):\r
-                                EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "PATH attribute was not provided for BPDG guid tool %s in tools_def.txt" % self.Platform.VpdToolGuid)\r
-                            BPDGToolName = ToolDef["PATH"]\r
-                            break\r
-                    # Call third party GUID BPDG tool.\r
-                    if BPDGToolName != None:\r
-                        VpdInfoFile.CallExtenalBPDGTool(BPDGToolName, VpdFilePath)\r
-                    else:\r
-                        EdkLogger.error("Build", FILE_NOT_FOUND, "Fail to find third-party BPDG tool to process VPD PCDs. BPDG Guid tool need to be defined in tools_def.txt and VPD_TOOL_GUID need to be provided in DSC file.")\r
-                        \r
+                self.FixVpdOffset(VpdFile)\r
+\r
+                self.FixVpdOffset(self.UpdateNVStoreMaxSize(VpdFile))\r
+\r
                 # Process VPD map file generated by third party BPDG tool\r
                 if NeedProcessVpdMapFile:\r
                     VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)\r
                     if os.path.exists(VpdMapFilePath):\r
                         VpdFile.Read(VpdMapFilePath)\r
-                \r
+\r
                         # Fixup "*" offset\r
-                        for Pcd in self._DynamicPcdList:\r
+                        for pcd in VpdSkuMap:\r
+                            vpdinfo = VpdFile.GetVpdInfo(pcd)\r
+                            if vpdinfo is None:\r
                             # just pick the a value to determine whether is unicode string type\r
-                            i = 0\r
-                            for (SkuName,Sku) in Pcd.SkuInfoList.items():                        \r
-                                if Sku.VpdOffset == "*":\r
-                                    Sku.VpdOffset = VpdFile.GetOffset(Pcd)[i].strip()\r
-                                i += 1\r
+                                continue\r
+                            for pcdvalue in VpdSkuMap[pcd]:\r
+                                for sku in VpdSkuMap[pcd][pcdvalue]:\r
+                                    for item in vpdinfo:\r
+                                        if item[2] == pcdvalue:\r
+                                            sku.VpdOffset = item[1]\r
                     else:\r
                         EdkLogger.error("build", FILE_READ_FAILURE, "Can not find VPD map file %s to fix up VPD offset." % VpdMapFilePath)\r
-            \r
-            # Delete the DynamicPcdList At the last time enter into this function \r
-            del self._DynamicPcdList[:]                        \r
-        self._DynamicPcdList.extend(UnicodePcdArray)\r
-        self._DynamicPcdList.extend(HiiPcdArray)\r
-        self._DynamicPcdList.extend(OtherPcdArray)\r
+\r
+            # Delete the DynamicPcdList At the last time enter into this function\r
+            for Pcd in self._DynamicPcdList:\r
+                # just pick the a value to determine whether is unicode string type\r
+                Sku = Pcd.SkuInfoList[Pcd.SkuInfoList.keys()[0]]\r
+                Sku.VpdOffset = Sku.VpdOffset.strip()\r
+\r
+                if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
+                    Pcd.DatumType = "VOID*"\r
+\r
+                PcdValue = Sku.DefaultValue\r
+                if Pcd.DatumType == 'VOID*' and PcdValue.startswith("L"):\r
+                    # if found PCD which datum value is unicode string the insert to left size of UnicodeIndex\r
+                    UnicodePcdArray.add(Pcd)\r
+                elif len(Sku.VariableName) > 0:\r
+                    # if found HII type PCD then insert to right of UnicodeIndex\r
+                    HiiPcdArray.add(Pcd)\r
+                else:\r
+                    OtherPcdArray.add(Pcd)\r
+            del self._DynamicPcdList[:]\r
+        self._DynamicPcdList.extend(list(UnicodePcdArray))\r
+        self._DynamicPcdList.extend(list(HiiPcdArray))\r
+        self._DynamicPcdList.extend(list(OtherPcdArray))\r
+        allskuset = [(SkuName,Sku.SkuId) for pcd in self._DynamicPcdList for (SkuName,Sku) in pcd.SkuInfoList.items()]\r
+        for pcd in self._DynamicPcdList:\r
+            if len(pcd.SkuInfoList) == 1:\r
+                for (SkuName,SkuId) in allskuset:\r
+                    if type(SkuId) in (str,unicode) and eval(SkuId) == 0 or SkuId == 0:\r
+                        continue\r
+                    pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList['DEFAULT'])\r
+                    pcd.SkuInfoList[SkuName].SkuId = SkuId\r
         self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList\r
-        \r
+\r
+    def FixVpdOffset(self,VpdFile ):\r
+        FvPath = os.path.join(self.BuildDir, "FV")\r
+        if not os.path.exists(FvPath):\r
+            try:\r
+                os.makedirs(FvPath)\r
+            except:\r
+                EdkLogger.error("build", FILE_WRITE_FAILURE, "Fail to create FV folder under %s" % self.BuildDir)\r
+\r
+        VpdFilePath = os.path.join(FvPath, "%s.txt" % self.Platform.VpdToolGuid)\r
+\r
+        if VpdFile.Write(VpdFilePath):\r
+            # retrieve BPDG tool's path from tool_def.txt according to VPD_TOOL_GUID defined in DSC file.\r
+            BPDGToolName = None\r
+            for ToolDef in self.ToolDefinition.values():\r
+                if ToolDef.has_key("GUID") and ToolDef["GUID"] == self.Platform.VpdToolGuid:\r
+                    if not ToolDef.has_key("PATH"):\r
+                        EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "PATH attribute was not provided for BPDG guid tool %s in tools_def.txt" % self.Platform.VpdToolGuid)\r
+                    BPDGToolName = ToolDef["PATH"]\r
+                    break\r
+            # Call third party GUID BPDG tool.\r
+            if BPDGToolName != None:\r
+                VpdInfoFile.CallExtenalBPDGTool(BPDGToolName, VpdFilePath)\r
+            else:\r
+                EdkLogger.error("Build", FILE_NOT_FOUND, "Fail to find third-party BPDG tool to process VPD PCDs. BPDG Guid tool need to be defined in tools_def.txt and VPD_TOOL_GUID need to be provided in DSC file.")\r
+\r
     ## Return the platform build data object\r
     def _GetPlatform(self):\r
         if self._Platform == None:\r
@@ -1311,6 +1867,7 @@ class PlatformAutoGen(AutoGen):
                                             self.OutputDir,\r
                                             self.BuildTarget + "_" + self.ToolChain,\r
                                             )\r
+            GlobalData.gBuildDirectory = self._BuildDir\r
         return self._BuildDir\r
 \r
     ## Return directory of platform makefile\r
@@ -1335,6 +1892,13 @@ class PlatformAutoGen(AutoGen):
                     NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
                     if NewOption != '':\r
                         self._BuildCommand += SplitOption(NewOption)\r
+                if "MAKE" in self.EdkIIBuildOption:\r
+                    if "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
+                        Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
+                        if Flags.startswith('='):\r
+                            self._BuildCommand = [self._BuildCommand[0]] + [Flags[1:]]\r
+                        else:\r
+                            self._BuildCommand += [Flags]\r
         return self._BuildCommand\r
 \r
     ## Get tool chain definition\r
@@ -1379,7 +1943,10 @@ class PlatformAutoGen(AutoGen):
                         if self.BuildOption[Tool][Attr].startswith('='):\r
                             Value = self.BuildOption[Tool][Attr][1:]\r
                         else:\r
-                            Value += " " + self.BuildOption[Tool][Attr]\r
+                            if Attr != 'PATH':\r
+                                Value += " " + self.BuildOption[Tool][Attr]\r
+                            else:\r
+                                Value = self.BuildOption[Tool][Attr]\r
 \r
                     if Attr == "PATH":\r
                         # Don't put MAKE definition in the file\r
@@ -1471,10 +2038,10 @@ class PlatformAutoGen(AutoGen):
             else:\r
                 if self._BuildRule._FileVersion < AutoGenReqBuildRuleVerNum :\r
                     # If Build Rule's version is less than the version number required by the tools, halting the build.\r
-                    EdkLogger.error("build", AUTOGEN_ERROR, \r
+                    EdkLogger.error("build", AUTOGEN_ERROR,\r
                                     ExtraData="The version number [%s] of build_rule.txt is less than the version number required by the AutoGen.(the minimum required version number is [%s])"\\r
                                      % (self._BuildRule._FileVersion, AutoGenReqBuildRuleVerNum))\r
-              \r
+\r
         return self._BuildRule\r
 \r
     ## Summarize the packages used by modules in this platform\r
@@ -1534,28 +2101,28 @@ class PlatformAutoGen(AutoGen):
                         EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
                         self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
                         TokenNumber += 1\r
-                        \r
+\r
             for Pcd in self.DynamicPcdList:\r
                 if Pcd.Phase == "PEI":\r
                     if Pcd.Type in ["DynamicEx", "DynamicExDefault", "DynamicExVpd", "DynamicExHii"]:\r
                         EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
                         self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
                         TokenNumber += 1\r
-                        \r
+\r
             for Pcd in self.DynamicPcdList:\r
                 if Pcd.Phase == "DXE":\r
                     if Pcd.Type in ["Dynamic", "DynamicDefault", "DynamicVpd", "DynamicHii"]:\r
                         EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
                         self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
                         TokenNumber += 1\r
-                        \r
+\r
             for Pcd in self.DynamicPcdList:\r
                 if Pcd.Phase == "DXE":\r
                     if Pcd.Type in ["DynamicEx", "DynamicExDefault", "DynamicExVpd", "DynamicExHii"]:\r
                         EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
                         self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
                         TokenNumber += 1\r
-                        \r
+\r
             for Pcd in self.NonDynamicPcdList:\r
                 self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
                 TokenNumber += 1\r
@@ -1613,6 +2180,10 @@ class PlatformAutoGen(AutoGen):
     #   @retval library_list    List of library instances sorted\r
     #\r
     def ApplyLibraryInstance(self, Module):\r
+        # Cover the case that the binary INF file is list in the FDF file but not DSC file, return empty list directly\r
+        if str(Module) not in self.Platform.Modules:\r
+            return []\r
+\r
         ModuleType = Module.ModuleType\r
 \r
         # for overridding library instances with module specific setting\r
@@ -1781,18 +2352,23 @@ class PlatformAutoGen(AutoGen):
         # at this point, ToPcd.Type has the type found from dependent\r
         # package\r
         #\r
+        TokenCName = ToPcd.TokenCName\r
+        for PcdItem in GlobalData.MixedPcd:\r
+            if (ToPcd.TokenCName, ToPcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
+                TokenCName = PcdItem[0]\r
+                break\r
         if FromPcd != None:\r
             if ToPcd.Pending and FromPcd.Type not in [None, '']:\r
                 ToPcd.Type = FromPcd.Type\r
             elif (ToPcd.Type not in [None, '']) and (FromPcd.Type not in [None, ''])\\r
                 and (ToPcd.Type != FromPcd.Type) and (ToPcd.Type in FromPcd.Type):\r
                 if ToPcd.Type.strip() == "DynamicEx":\r
-                    ToPcd.Type = FromPcd.Type             \r
+                    ToPcd.Type = FromPcd.Type\r
             elif ToPcd.Type not in [None, ''] and FromPcd.Type not in [None, ''] \\r
                 and ToPcd.Type != FromPcd.Type:\r
                 EdkLogger.error("build", OPTION_CONFLICT, "Mismatched PCD type",\r
                                 ExtraData="%s.%s is defined as [%s] in module %s, but as [%s] in platform."\\r
-                                          % (ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName,\r
+                                          % (ToPcd.TokenSpaceGuidCName, TokenCName,\r
                                              ToPcd.Type, Module, FromPcd.Type),\r
                                           File=self.MetaFile)\r
 \r
@@ -1808,19 +2384,26 @@ class PlatformAutoGen(AutoGen):
                 ToPcd.DatumType = FromPcd.DatumType\r
             if FromPcd.SkuInfoList not in [None, '', []]:\r
                 ToPcd.SkuInfoList = FromPcd.SkuInfoList\r
+            # Add Flexible PCD format parse\r
+            if ToPcd.DefaultValue:\r
+                try:\r
+                    ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, self._GuidDict)(True)\r
+                except BadExpression, Value:\r
+                    EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName, ToPcd.DefaultValue, Value),\r
+                                        File=self.MetaFile)\r
 \r
             # check the validation of datum\r
             IsValid, Cause = CheckPcdDatum(ToPcd.DatumType, ToPcd.DefaultValue)\r
             if not IsValid:\r
                 EdkLogger.error('build', FORMAT_INVALID, Cause, File=self.MetaFile,\r
-                                ExtraData="%s.%s" % (ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName))\r
+                                ExtraData="%s.%s" % (ToPcd.TokenSpaceGuidCName, TokenCName))\r
             ToPcd.validateranges = FromPcd.validateranges\r
             ToPcd.validlists = FromPcd.validlists\r
             ToPcd.expressions = FromPcd.expressions\r
 \r
-        if ToPcd.DatumType == "VOID*" and ToPcd.MaxDatumSize in ['', None]:\r
+        if FromPcd != None and ToPcd.DatumType == "VOID*" and ToPcd.MaxDatumSize in ['', None]:\r
             EdkLogger.debug(EdkLogger.DEBUG_9, "No MaxDatumSize specified for PCD %s.%s" \\r
-                            % (ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName))\r
+                            % (ToPcd.TokenSpaceGuidCName, TokenCName))\r
             Value = ToPcd.DefaultValue\r
             if Value in [None, '']:\r
                 ToPcd.MaxDatumSize = '1'\r
@@ -1839,7 +2422,7 @@ class PlatformAutoGen(AutoGen):
             else:\r
                 SkuName = 'DEFAULT'\r
             ToPcd.SkuInfoList = {\r
-                SkuName : SkuInfoClass(SkuName, self.Platform.SkuIds[SkuName], '', '', '', '', '', ToPcd.DefaultValue)\r
+                SkuName : SkuInfoClass(SkuName, self.Platform.SkuIds[SkuName][0], '', '', '', '', '', ToPcd.DefaultValue)\r
             }\r
 \r
     ## Apply PCD setting defined platform to a module\r
@@ -1850,11 +2433,11 @@ class PlatformAutoGen(AutoGen):
     #\r
     def ApplyPcdSetting(self, Module, Pcds):\r
         # for each PCD in module\r
-        for Name,Guid in Pcds:\r
-            PcdInModule = Pcds[Name,Guid]\r
+        for Name, Guid in Pcds:\r
+            PcdInModule = Pcds[Name, Guid]\r
             # find out the PCD setting in platform\r
-            if (Name,Guid) in self.Platform.Pcds:\r
-                PcdInPlatform = self.Platform.Pcds[Name,Guid]\r
+            if (Name, Guid) in self.Platform.Pcds:\r
+                PcdInPlatform = self.Platform.Pcds[Name, Guid]\r
             else:\r
                 PcdInPlatform = None\r
             # then override the settings if any\r
@@ -1863,7 +2446,7 @@ class PlatformAutoGen(AutoGen):
             for SkuId in PcdInModule.SkuInfoList:\r
                 Sku = PcdInModule.SkuInfoList[SkuId]\r
                 if Sku.VariableGuid == '': continue\r
-                Sku.VariableGuidValue = GuidValue(Sku.VariableGuid, self.PackageList)\r
+                Sku.VariableGuidValue = GuidValue(Sku.VariableGuid, self.PackageList, self.MetaFile.Path)\r
                 if Sku.VariableGuidValue == None:\r
                     PackageList = "\n\t".join([str(P) for P in self.PackageList])\r
                     EdkLogger.error(\r
@@ -1879,8 +2462,31 @@ class PlatformAutoGen(AutoGen):
         if Module in self.Platform.Modules:\r
             PlatformModule = self.Platform.Modules[str(Module)]\r
             for Key  in PlatformModule.Pcds:\r
+                Flag = False\r
                 if Key in Pcds:\r
-                    self._OverridePcd(Pcds[Key], PlatformModule.Pcds[Key], Module)\r
+                    ToPcd = Pcds[Key]\r
+                    Flag = True\r
+                elif Key in GlobalData.MixedPcd:\r
+                    for PcdItem in GlobalData.MixedPcd[Key]:\r
+                        if PcdItem in Pcds:\r
+                            ToPcd = Pcds[PcdItem]\r
+                            Flag = True\r
+                            break\r
+                if Flag:\r
+                    self._OverridePcd(ToPcd, PlatformModule.Pcds[Key], Module)\r
+        # use PCD value to calculate the MaxDatumSize when it is not specified\r
+        for Name, Guid in Pcds:\r
+            Pcd = Pcds[Name, Guid]\r
+            if Pcd.DatumType == "VOID*" and Pcd.MaxDatumSize in ['', None]:\r
+                Value = Pcd.DefaultValue\r
+                if Value in [None, '']:\r
+                    Pcd.MaxDatumSize = '1'\r
+                elif Value[0] == 'L':\r
+                    Pcd.MaxDatumSize = str((len(Value) - 2) * 2)\r
+                elif Value[0] == '{':\r
+                    Pcd.MaxDatumSize = str(len(Value.split(',')))\r
+                else:\r
+                    Pcd.MaxDatumSize = str(len(Value) - 1)\r
         return Pcds.values()\r
 \r
     ## Resolve library names to library modules\r
@@ -1927,8 +2533,8 @@ class PlatformAutoGen(AutoGen):
     # @retval   Value  Priority value based on the priority list.\r
     #\r
     def CalculatePriorityValue(self, Key):\r
-        Target, ToolChain, Arch, CommandType, Attr = Key.split('_')       \r
-        PriorityValue = 0x11111          \r
+        Target, ToolChain, Arch, CommandType, Attr = Key.split('_')\r
+        PriorityValue = 0x11111\r
         if Target == "*":\r
             PriorityValue &= 0x01111\r
         if ToolChain == "*":\r
@@ -1939,9 +2545,9 @@ class PlatformAutoGen(AutoGen):
             PriorityValue &= 0x11101\r
         if Attr == "*":\r
             PriorityValue &= 0x11110\r
-        \r
-        return self.PrioList["0x%0.5x"%PriorityValue]\r
-                                    \r
+\r
+        return self.PrioList["0x%0.5x" % PriorityValue]\r
+\r
 \r
     ## Expand * in build option key\r
     #\r
@@ -1953,7 +2559,7 @@ class PlatformAutoGen(AutoGen):
         BuildOptions = {}\r
         FamilyMatch  = False\r
         FamilyIsNull = True\r
-                \r
+\r
         OverrideList = {}\r
         #\r
         # Construct a list contain the build options which need override.\r
@@ -1970,7 +2576,7 @@ class PlatformAutoGen(AutoGen):
                     if ToolChain == self.ToolChain or ToolChain == "*":\r
                         if Arch == self.Arch or Arch == "*":\r
                             if Options[Key].startswith("="):\r
-                                if OverrideList.get(Key[1]) != None:                                                \r
+                                if OverrideList.get(Key[1]) != None:\r
                                     OverrideList.pop(Key[1])\r
                                 OverrideList[Key[1]] = Options[Key]\r
         \r
@@ -1978,9 +2584,9 @@ class PlatformAutoGen(AutoGen):
         # Use the highest priority value. \r
         #\r
         if (len(OverrideList) >= 2):\r
-            KeyList   = OverrideList.keys()\r
+            KeyList = OverrideList.keys()\r
             for Index in range(len(KeyList)):\r
-                NowKey      = KeyList[Index]\r
+                NowKey = KeyList[Index]\r
                 Target1, ToolChain1, Arch1, CommandType1, Attr1 = NowKey.split("_")\r
                 for Index1 in range(len(KeyList) - Index - 1):\r
                     NextKey = KeyList[Index1 + Index + 1]\r
@@ -1994,10 +2600,10 @@ class PlatformAutoGen(AutoGen):
                                 if CommandType1 == CommandType2 or CommandType1 == "*" or CommandType2 == "*":\r
                                     if Attr1 == Attr2 or Attr1 == "*" or Attr2 == "*":\r
                                         if self.CalculatePriorityValue(NowKey) > self.CalculatePriorityValue(NextKey):\r
-                                            if Options.get((self.BuildRuleFamily, NextKey)) != None:  \r
+                                            if Options.get((self.BuildRuleFamily, NextKey)) != None:\r
                                                 Options.pop((self.BuildRuleFamily, NextKey))\r
                                         else:\r
-                                            if Options.get((self.BuildRuleFamily, NowKey)) != None: \r
+                                            if Options.get((self.BuildRuleFamily, NowKey)) != None:\r
                                                 Options.pop((self.BuildRuleFamily, NowKey))\r
                                                            \r
         for Key in Options:\r
@@ -2028,8 +2634,11 @@ class PlatformAutoGen(AutoGen):
                         if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or Options[Key].startswith('='):\r
                             BuildOptions[Tool][Attr] = Options[Key]\r
                         else:\r
-                            # append options for the same tool\r
-                            BuildOptions[Tool][Attr] += " " + Options[Key]\r
+                            # append options for the same tool except PATH\r
+                            if Attr != 'PATH':\r
+                                BuildOptions[Tool][Attr] += " " + Options[Key]\r
+                            else:\r
+                                BuildOptions[Tool][Attr] = Options[Key]\r
         # Build Option Family has been checked, which need't to be checked again for family.\r
         if FamilyMatch or FamilyIsNull:\r
             return BuildOptions\r
@@ -2045,7 +2654,7 @@ class PlatformAutoGen(AutoGen):
             Family = Key[0]\r
             Target, Tag, Arch, Tool, Attr = Key[1].split("_")\r
             # if tool chain family doesn't match, skip it\r
-            if Tool not in self.ToolDefinition or Family =="":\r
+            if Tool not in self.ToolDefinition or Family == "":\r
                 continue\r
             # option has been added before\r
             if Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_FAMILY]:\r
@@ -2060,8 +2669,11 @@ class PlatformAutoGen(AutoGen):
                         if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or Options[Key].startswith('='):\r
                             BuildOptions[Tool][Attr] = Options[Key]\r
                         else:\r
-                            # append options for the same tool\r
-                            BuildOptions[Tool][Attr] += " " + Options[Key]\r
+                            # append options for the same tool except PATH\r
+                            if Attr != 'PATH':\r
+                                BuildOptions[Tool][Attr] += " " + Options[Key]\r
+                            else:\r
+                                BuildOptions[Tool][Attr] = Options[Key]\r
         return BuildOptions\r
 \r
     ## Append build options in platform to a module\r
@@ -2120,7 +2732,10 @@ class PlatformAutoGen(AutoGen):
                         BuildOptions[Tool][Attr] = ToolPath\r
                     else:\r
                         Value = mws.handleWsMacro(Value)\r
-                        BuildOptions[Tool][Attr] += " " + Value\r
+                        if Attr != 'PATH':\r
+                            BuildOptions[Tool][Attr] += " " + Value\r
+                        else:\r
+                            BuildOptions[Tool][Attr] = Value\r
         if Module.AutoGenVersion < 0x00010005 and self.Workspace.UniFlag != None:\r
             #\r
             # Override UNI flag only for EDK module.\r
@@ -2167,11 +2782,29 @@ class PlatformAutoGen(AutoGen):
 # to the [depex] section in module's inf file.\r
 #\r
 class ModuleAutoGen(AutoGen):\r
-    ## The real constructor of ModuleAutoGen\r
+    # call super().__init__ then call the worker function with different parameter count\r
+    def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
+        try:\r
+            self._Init\r
+        except:\r
+            super(ModuleAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args)\r
+            self._Init = True\r
+\r
+    ## Cache the timestamps of metafiles of every module in a class variable\r
     #\r
-    #  This method is not supposed to be called by users of ModuleAutoGen. It's\r
-    #  only used by factory method __new__() to do real initialization work for an\r
-    #  object of ModuleAutoGen\r
+    TimeDict = {}\r
+\r
+    def __new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
+        obj = super(ModuleAutoGen, cls).__new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+        # check if this module is employed by active platform\r
+        if not PlatformAutoGen(Workspace, args[0], Target, Toolchain, Arch).ValidModule(MetaFile):\r
+            EdkLogger.verbose("Module [%s] for [%s] is not employed by active platform\n" \\r
+                              % (MetaFile, Arch))\r
+            return None\r
+        return obj\r
+            \r
+    ## Initialize ModuleAutoGen\r
     #\r
     #   @param      Workspace           EdkIIWorkspaceBuild object\r
     #   @param      ModuleFile          The path of module file\r
@@ -2180,7 +2813,7 @@ class ModuleAutoGen(AutoGen):
     #   @param      Arch                The arch the module supports\r
     #   @param      PlatformFile        Platform meta-file\r
     #\r
-    def _Init(self, Workspace, ModuleFile, Target, Toolchain, Arch, PlatformFile):\r
+    def _InitWorker(self, Workspace, ModuleFile, Target, Toolchain, Arch, PlatformFile):\r
         EdkLogger.debug(EdkLogger.DEBUG_9, "AutoGen module [%s] [%s]" % (ModuleFile, Arch))\r
         GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (ModuleFile, Arch, Toolchain, Target)\r
 \r
@@ -2189,11 +2822,6 @@ class ModuleAutoGen(AutoGen):
 \r
         self.MetaFile = ModuleFile\r
         self.PlatformInfo = PlatformAutoGen(Workspace, PlatformFile, Target, Toolchain, Arch)\r
-        # check if this module is employed by active platform\r
-        if not self.PlatformInfo.ValidModule(self.MetaFile):\r
-            EdkLogger.verbose("Module [%s] for [%s] is not employed by active platform\n" \\r
-                              % (self.MetaFile, Arch))\r
-            return False\r
 \r
         self.SourceDir = self.MetaFile.SubDir\r
         self.SourceDir = mws.relpath(self.SourceDir, self.WorkspaceDir)\r
@@ -2216,6 +2844,7 @@ class ModuleAutoGen(AutoGen):
 \r
         self.BuildDatabase = self.Workspace.BuildDatabase\r
         self.BuildRuleOrder = None\r
+        self.BuildTime      = 0\r
 \r
         self._Module          = None\r
         self._Name            = None\r
@@ -2231,12 +2860,16 @@ class ModuleAutoGen(AutoGen):
 \r
         self._BuildDir        = None\r
         self._OutputDir       = None\r
+        self._FfsOutputDir    = None\r
         self._DebugDir        = None\r
         self._MakeFileDir     = None\r
 \r
         self._IncludePathList = None\r
+        self._IncludePathLength = 0\r
         self._AutoGenFileList = None\r
         self._UnicodeFileList = None\r
+        self._VfrFileList = None\r
+        self._IdfFileList = None\r
         self._SourceFileList  = None\r
         self._ObjectFileList  = None\r
         self._BinaryFileList  = None\r
@@ -2264,6 +2897,11 @@ class ModuleAutoGen(AutoGen):
         self._FinalBuildTargetList    = None\r
         self._FileTypes               = None\r
         self._BuildRules              = None\r
+\r
+        self._TimeStampPath           = None\r
+\r
+        self.AutoGenDepSet = set()\r
+\r
         \r
         ## The Modules referenced to this Library\r
         #  Only Library has this attribute\r
@@ -2283,10 +2921,7 @@ class ModuleAutoGen(AutoGen):
         if self._FixedAtBuildPcds:\r
             return self._FixedAtBuildPcds\r
         for Pcd in self.ModulePcdList:\r
-            if self.IsLibrary:\r
-                if not (Pcd.Pending == False and Pcd.Type == "FixedAtBuild"):\r
-                    continue\r
-            elif Pcd.Type != "FixedAtBuild":\r
+            if Pcd.Type != "FixedAtBuild":\r
                 continue\r
             if Pcd not in self._FixedAtBuildPcds:\r
                 self._FixedAtBuildPcds.append(Pcd)\r
@@ -2334,6 +2969,15 @@ class ModuleAutoGen(AutoGen):
             self._Macro["MODULE_BUILD_DIR"      ] = self.BuildDir\r
             self._Macro["OUTPUT_DIR"            ] = self.OutputDir\r
             self._Macro["DEBUG_DIR"             ] = self.DebugDir\r
+            self._Macro["DEST_DIR_OUTPUT"       ] = self.OutputDir\r
+            self._Macro["DEST_DIR_DEBUG"        ] = self.DebugDir\r
+            self._Macro["PLATFORM_NAME"         ] = self.PlatformInfo.Name\r
+            self._Macro["PLATFORM_GUID"         ] = self.PlatformInfo.Guid\r
+            self._Macro["PLATFORM_VERSION"      ] = self.PlatformInfo.Version\r
+            self._Macro["PLATFORM_RELATIVE_DIR" ] = self.PlatformInfo.SourceDir\r
+            self._Macro["PLATFORM_DIR"          ] = mws.join(self.WorkspaceDir, self.PlatformInfo.SourceDir)\r
+            self._Macro["PLATFORM_OUTPUT_DIR"   ] = self.PlatformInfo.OutputDir\r
+            self._Macro["FFS_OUTPUT_DIR"        ] = self.FfsOutputDir\r
         return self._Macro\r
 \r
     ## Return the module build data object\r
@@ -2424,6 +3068,15 @@ class ModuleAutoGen(AutoGen):
             CreateDirectory(self._OutputDir)\r
         return self._OutputDir\r
 \r
+    ## Return the directory to store ffs file\r
+    def _GetFfsOutputDir(self):\r
+        if self._FfsOutputDir == None:\r
+            if GlobalData.gFdfParser != None:\r
+                self._FfsOutputDir = path.join(self.PlatformInfo.BuildDir, "FV", "Ffs", self.Guid + self.Name)\r
+            else:\r
+                self._FfsOutputDir = ''\r
+        return self._FfsOutputDir\r
+\r
     ## Return the directory to store auto-gened source files of the mdoule\r
     def _GetDebugDir(self):\r
         if self._DebugDir == None:\r
@@ -2492,17 +3145,18 @@ class ModuleAutoGen(AutoGen):
             for DepexExpresion in DepexExpresionList:\r
                 for key in DepexExpresion.keys():\r
                     Arch, ModuleType = key\r
+                    DepexExpr = [x for x in DepexExpresion[key] if not str(x).startswith('#')]\r
                     # the type of build module is USER_DEFINED.\r
                     # All different DEPEX section tags would be copied into the As Built INF file\r
                     # and there would be separate DEPEX section tags\r
                     if self.ModuleType.upper() == SUP_MODULE_USER_DEFINED:\r
                         if (Arch.upper() == self.Arch.upper()) and (ModuleType.upper() != TAB_ARCH_COMMON):\r
-                            DepexList.append({(Arch, ModuleType): DepexExpresion[key][:]})\r
+                            DepexList.append({(Arch, ModuleType): DepexExpr})\r
                     else:\r
                         if Arch.upper() == TAB_ARCH_COMMON or \\r
                           (Arch.upper() == self.Arch.upper() and \\r
                           ModuleType.upper() in [TAB_ARCH_COMMON, self.ModuleType.upper()]):\r
-                            DepexList.append({(Arch, ModuleType): DepexExpresion[key][:]})\r
+                            DepexList.append({(Arch, ModuleType): DepexExpr})\r
         \r
         #the type of build module is USER_DEFINED.\r
         if self.ModuleType.upper() == SUP_MODULE_USER_DEFINED:\r
@@ -2607,6 +3261,30 @@ class ModuleAutoGen(AutoGen):
                 self._DepexExpressionList[ModuleType] = DepexExpressionList\r
         return self._DepexExpressionList\r
 \r
+    # Get the tiano core user extension, it is contain dependent library.\r
+    # @retval: a list contain tiano core userextension.\r
+    #\r
+    def _GetTianoCoreUserExtensionList(self):\r
+        TianoCoreUserExtentionList = []\r
+        for M in [self.Module] + self.DependentLibraryList:\r
+            Filename = M.MetaFile.Path\r
+            InfObj = InfSectionParser.InfSectionParser(Filename)\r
+            TianoCoreUserExtenList = InfObj.GetUserExtensionTianoCore()\r
+            for TianoCoreUserExtent in TianoCoreUserExtenList:\r
+                for Section in TianoCoreUserExtent.keys():\r
+                    ItemList = Section.split(TAB_SPLIT)\r
+                    Arch = self.Arch\r
+                    if len(ItemList) == 4:\r
+                        Arch = ItemList[3]\r
+                    if Arch.upper() == TAB_ARCH_COMMON or Arch.upper() == self.Arch.upper():\r
+                        TianoCoreList = []\r
+                        TianoCoreList.extend([TAB_SECTION_START + Section + TAB_SECTION_END])\r
+                        TianoCoreList.extend(TianoCoreUserExtent[Section][:])\r
+                        TianoCoreList.append('\n')\r
+                        TianoCoreUserExtentionList.append(TianoCoreList)\r
+\r
+        return TianoCoreUserExtentionList\r
+\r
     ## Return the list of specification version required for the module\r
     #\r
     #   @retval     list    The list of specification defined in module file\r
@@ -2637,9 +3315,9 @@ class ModuleAutoGen(AutoGen):
             # is the former use /I , the Latter used -I to specify include directories\r
             #\r
             if self.PlatformInfo.ToolChainFamily in ('MSFT'):\r
-                gBuildOptIncludePattern = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE|re.DOTALL)\r
+                gBuildOptIncludePattern = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL)\r
             elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'):\r
-                gBuildOptIncludePattern = re.compile(r"(?:.*?)-I[ \t]*([^ ]*)", re.MULTILINE|re.DOTALL)\r
+                gBuildOptIncludePattern = re.compile(r"(?:.*?)-I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL)\r
             else:\r
                 #\r
                 # New ToolChainFamily, don't known whether there is option to specify include directories\r
@@ -2673,11 +3351,11 @@ class ModuleAutoGen(AutoGen):
                 if self.AutoGenVersion >= 0x00010005 and len(IncPathList) > 0:\r
                     for Path in IncPathList:\r
                         if (Path not in self.IncludePathList) and (CommonPath([Path, self.MetaFile.Dir]) != self.MetaFile.Dir):\r
-                            ErrMsg = "The include directory for the EDK II module in this line is invalid %s specified in %s FLAGS '%s'" % (Path, Tool, FlagOption) \r
-                            EdkLogger.error("build", \r
+                            ErrMsg = "The include directory for the EDK II module in this line is invalid %s specified in %s FLAGS '%s'" % (Path, Tool, FlagOption)\r
+                            EdkLogger.error("build",\r
                                             PARAMETER_INVALID,\r
-                                            ExtraData = ErrMsg, \r
-                                            File = str(self.MetaFile))\r
+                                            ExtraData=ErrMsg,\r
+                                            File=str(self.MetaFile))\r
 \r
                 \r
                 BuildOptionIncPathList += IncPathList\r
@@ -2700,22 +3378,49 @@ class ModuleAutoGen(AutoGen):
                     EdkLogger.debug(EdkLogger.DEBUG_9, "The toolchain [%s] for processing file [%s] is found, "\r
                                     "but [%s] is needed" % (F.TagName, str(F), self.ToolChain))\r
                     continue\r
-                # match tool chain family\r
-                if F.ToolChainFamily not in ("", "*", self.ToolChainFamily):\r
+                # match tool chain family or build rule family\r
+                if F.ToolChainFamily not in ("", "*", self.ToolChainFamily, self.BuildRuleFamily):\r
                     EdkLogger.debug(\r
                                 EdkLogger.DEBUG_0,\r
                                 "The file [%s] must be built by tools of [%s], " \\r
-                                "but current toolchain family is [%s]" \\r
-                                    % (str(F), F.ToolChainFamily, self.ToolChainFamily))\r
+                                "but current toolchain family is [%s], buildrule family is [%s]" \\r
+                                    % (str(F), F.ToolChainFamily, self.ToolChainFamily, self.BuildRuleFamily))\r
                     continue\r
 \r
                 # add the file path into search path list for file including\r
                 if F.Dir not in self.IncludePathList and self.AutoGenVersion >= 0x00010005:\r
                     self.IncludePathList.insert(0, F.Dir)\r
                 self._SourceFileList.append(F)\r
+\r
+            self._MatchBuildRuleOrder(self._SourceFileList)\r
+\r
+            for F in self._SourceFileList:\r
                 self._ApplyBuildRule(F, TAB_UNKNOWN_FILE)\r
         return self._SourceFileList\r
 \r
+    def _MatchBuildRuleOrder(self, FileList):\r
+        Order_Dict = {}\r
+        self._GetModuleBuildOption()\r
+        for SingleFile in FileList:\r
+            if self.BuildRuleOrder and SingleFile.Ext in self.BuildRuleOrder and SingleFile.Ext in self.BuildRules:\r
+                key = SingleFile.Path.split(SingleFile.Ext)[0]\r
+                if key in Order_Dict:\r
+                    Order_Dict[key].append(SingleFile.Ext)\r
+                else:\r
+                    Order_Dict[key] = [SingleFile.Ext]\r
+\r
+        RemoveList = []\r
+        for F in Order_Dict:\r
+            if len(Order_Dict[F]) > 1:\r
+                Order_Dict[F].sort(key=lambda i: self.BuildRuleOrder.index(i))\r
+                for Ext in Order_Dict[F][1:]:\r
+                    RemoveList.append(F + Ext)\r
+                   \r
+        for item in RemoveList:\r
+            FileList.remove(item)\r
+\r
+        return FileList\r
+\r
     ## Return the list of unicode files\r
     def _GetUnicodeFileList(self):\r
         if self._UnicodeFileList == None:\r
@@ -2725,6 +3430,24 @@ class ModuleAutoGen(AutoGen):
                 self._UnicodeFileList = []\r
         return self._UnicodeFileList\r
 \r
+    ## Return the list of vfr files\r
+    def _GetVfrFileList(self):\r
+        if self._VfrFileList == None:\r
+            if TAB_VFR_FILE in self.FileTypes:\r
+                self._VfrFileList = self.FileTypes[TAB_VFR_FILE]\r
+            else:\r
+                self._VfrFileList = []\r
+        return self._VfrFileList\r
+\r
+    ## Return the list of Image Definition files\r
+    def _GetIdfFileList(self):\r
+        if self._IdfFileList == None:\r
+            if TAB_IMAGE_FILE in self.FileTypes:\r
+                self._IdfFileList = self.FileTypes[TAB_IMAGE_FILE]\r
+            else:\r
+                self._IdfFileList = []\r
+        return self._IdfFileList\r
+\r
     ## Return a list of files which can be built from binary\r
     #\r
     #  "Build" binary files are just to copy them to build directory.\r
@@ -2797,7 +3520,7 @@ class ModuleAutoGen(AutoGen):
             if File.IsBinary and File == Source and self._BinaryFileList != None and File in self._BinaryFileList:\r
                 # Skip all files that are not binary libraries\r
                 if not self.IsLibrary:\r
-                    continue            \r
+                    continue\r
                 RuleObject = self.BuildRules[TAB_DEFAULT_BINARY_FILE]\r
             elif FileType in self.BuildRules:\r
                 RuleObject = self.BuildRules[FileType]\r
@@ -2887,15 +3610,19 @@ class ModuleAutoGen(AutoGen):
     #\r
     def _GetAutoGenFileList(self):\r
         UniStringAutoGenC = True\r
+        IdfStringAutoGenC = True\r
         UniStringBinBuffer = StringIO()\r
+        IdfGenBinBuffer = StringIO()\r
         if self.BuildType == 'UEFI_HII':\r
             UniStringAutoGenC = False\r
+            IdfStringAutoGenC = False\r
         if self._AutoGenFileList == None:\r
             self._AutoGenFileList = {}\r
             AutoGenC = TemplateString()\r
             AutoGenH = TemplateString()\r
             StringH = TemplateString()\r
-            GenC.CreateCode(self, AutoGenC, AutoGenH, StringH, UniStringAutoGenC, UniStringBinBuffer)\r
+            StringIdf = TemplateString()\r
+            GenC.CreateCode(self, AutoGenC, AutoGenH, StringH, UniStringAutoGenC, UniStringBinBuffer, StringIdf, IdfStringAutoGenC, IdfGenBinBuffer)\r
             #\r
             # AutoGen.c is generated if there are library classes in inf, or there are object files\r
             #\r
@@ -2919,6 +3646,17 @@ class ModuleAutoGen(AutoGen):
                 self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)\r
             if UniStringBinBuffer != None:\r
                 UniStringBinBuffer.close()\r
+            if str(StringIdf) != "":\r
+                AutoFile = PathClass(gAutoGenImageDefFileName % {"module_name":self.Name}, self.DebugDir)\r
+                self._AutoGenFileList[AutoFile] = str(StringIdf)\r
+                self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)\r
+            if IdfGenBinBuffer != None and IdfGenBinBuffer.getvalue() != "":\r
+                AutoFile = PathClass(gAutoGenIdfFileName % {"module_name":self.Name}, self.OutputDir)\r
+                self._AutoGenFileList[AutoFile] = IdfGenBinBuffer.getvalue()\r
+                AutoFile.IsBinary = True\r
+                self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)\r
+            if IdfGenBinBuffer != None:\r
+                IdfGenBinBuffer.close()\r
         return self._AutoGenFileList\r
 \r
     ## Return the list of library modules explicitly or implicityly used by this module\r
@@ -3047,11 +3785,22 @@ class ModuleAutoGen(AutoGen):
                 PackageDir = mws.join(self.WorkspaceDir, Package.MetaFile.Dir)\r
                 if PackageDir not in self._IncludePathList:\r
                     self._IncludePathList.append(PackageDir)\r
-                for Inc in Package.Includes:\r
+                IncludesList = Package.Includes\r
+                if Package._PrivateIncludes:\r
+                    if not self.MetaFile.Path.startswith(PackageDir):\r
+                        IncludesList = list(set(Package.Includes).difference(set(Package._PrivateIncludes)))\r
+                for Inc in IncludesList:\r
                     if Inc not in self._IncludePathList:\r
                         self._IncludePathList.append(str(Inc))\r
         return self._IncludePathList\r
 \r
+    def _GetIncludePathLength(self):\r
+        self._IncludePathLength = 0\r
+        if self._IncludePathList:\r
+            for inc in self._IncludePathList:\r
+                self._IncludePathLength += len(' ' + inc)\r
+        return self._IncludePathLength\r
+\r
     ## Get HII EX PCDs which maybe used by VFR\r
     #\r
     #  efivarstore used by VFR may relate with HII EX PCDs\r
@@ -3107,7 +3856,7 @@ class ModuleAutoGen(AutoGen):
             for SkuName in Pcd.SkuInfoList:\r
                 SkuInfo = Pcd.SkuInfoList[SkuName]\r
                 Name = ConvertStringToByteArray(SkuInfo.VariableName)\r
-                Value = GuidValue(SkuInfo.VariableGuid, self.PlatformInfo.PackageList)\r
+                Value = GuidValue(SkuInfo.VariableGuid, self.PlatformInfo.PackageList, self.MetaFile.Path)\r
                 if not Value:\r
                     continue\r
                 Guid = GuidStructureStringToGuidString(Value)\r
@@ -3189,7 +3938,13 @@ class ModuleAutoGen(AutoGen):
 \r
     ## Create AsBuilt INF file the module\r
     #\r
-    def CreateAsBuiltInf(self):\r
+    def CreateAsBuiltInf(self, IsOnlyCopy = False):\r
+        self.OutputFile = []\r
+        if IsOnlyCopy:\r
+            if GlobalData.gBinCacheDest:\r
+                self.CopyModuleToCache()\r
+                return\r
+\r
         if self.IsAsBuiltInfCreated:\r
             return\r
             \r
@@ -3214,13 +3969,13 @@ class ModuleAutoGen(AutoGen):
         # Find all DynamicEx and PatchableInModule PCDs used by this module and dependent libraries\r
         # Also find all packages that the DynamicEx PCDs depend on\r
         Pcds = []\r
-        PatchablePcds = {}\r
-        Packages = []        \r
+        PatchablePcds = []\r
+        Packages = []\r
         PcdCheckList = []\r
         PcdTokenSpaceList = []\r
         for Pcd in self.ModulePcdList + self.LibraryPcdList:\r
             if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE:\r
-                PatchablePcds[Pcd.TokenCName] = Pcd\r
+                PatchablePcds += [Pcd]\r
                 PcdCheckList.append((Pcd.TokenCName, Pcd.TokenSpaceGuidCName, 'PatchableInModule'))\r
             elif Pcd.Type in GenC.gDynamicExPcd:\r
                 if Pcd not in Pcds:\r
@@ -3292,7 +4047,7 @@ class ModuleAutoGen(AutoGen):
           'module_uefi_hii_resource_section'  : [MDefs['UEFI_HII_RESOURCE_SECTION']] if 'UEFI_HII_RESOURCE_SECTION' in MDefs else [],\r
           'module_uni_file'                   : [MDefs['MODULE_UNI_FILE']] if 'MODULE_UNI_FILE' in MDefs else [],\r
           'module_arch'                       : self.Arch,\r
-          'package_item'                      : ['%s' % (Package.MetaFile.File.replace('\\','/')) for Package in Packages],\r
+          'package_item'                      : ['%s' % (Package.MetaFile.File.replace('\\', '/')) for Package in Packages],\r
           'binary_item'                       : [],\r
           'patchablepcd_item'                 : [],\r
           'pcd_item'                          : [],\r
@@ -3303,6 +4058,11 @@ class ModuleAutoGen(AutoGen):
           'libraryclasses_item'               : []\r
         }\r
 \r
+        if 'MODULE_UNI_FILE' in MDefs:\r
+            UNIFile = os.path.join(self.MetaFile.Dir, MDefs['MODULE_UNI_FILE'])\r
+            if os.path.isfile(UNIFile):\r
+                shutil.copy2(UNIFile, self.OutputDir)\r
+\r
         if self.AutoGenVersion > int(gInfSpecVersion, 0):\r
             AsBuiltInfDict['module_inf_version'] = '0x%08x' % self.AutoGenVersion\r
         else:\r
@@ -3312,43 +4072,48 @@ class ModuleAutoGen(AutoGen):
             AsBuiltInfDict['pcd_is_driver_string'] += [DriverType]\r
 \r
         if 'UEFI_SPECIFICATION_VERSION' in self.Specification:\r
-          AsBuiltInfDict['module_uefi_specification_version'] += [self.Specification['UEFI_SPECIFICATION_VERSION']]\r
+            AsBuiltInfDict['module_uefi_specification_version'] += [self.Specification['UEFI_SPECIFICATION_VERSION']]\r
         if 'PI_SPECIFICATION_VERSION' in self.Specification:\r
-          AsBuiltInfDict['module_pi_specification_version'] += [self.Specification['PI_SPECIFICATION_VERSION']]\r
-\r
-        OutputDir = self.OutputDir.replace('\\','/').strip('/')\r
-        if self.ModuleType in ['BASE', 'USER_DEFINED']:\r
-          for Item in self.CodaTargetList:\r
-            File = Item.Target.Path.replace('\\','/').strip('/').replace(OutputDir,'').strip('/')\r
-            if Item.Target.Ext.lower() == '.aml': \r
-              AsBuiltInfDict['binary_item'] += ['ASL|' + File]\r
-            elif Item.Target.Ext.lower() == '.acpi': \r
-              AsBuiltInfDict['binary_item'] += ['ACPI|' + File]\r
-            else:\r
-              AsBuiltInfDict['binary_item'] += ['BIN|' + File]\r
-        else:\r
-          for Item in self.CodaTargetList:\r
-            File = Item.Target.Path.replace('\\','/').strip('/').replace(OutputDir,'').strip('/')\r
-            if Item.Target.Ext.lower() == '.efi': \r
-              AsBuiltInfDict['binary_item'] += ['PE32|' + self.Name + '.efi']\r
+            AsBuiltInfDict['module_pi_specification_version'] += [self.Specification['PI_SPECIFICATION_VERSION']]\r
+\r
+        OutputDir = self.OutputDir.replace('\\', '/').strip('/')\r
+        DebugDir = self.DebugDir.replace('\\', '/').strip('/')\r
+        for Item in self.CodaTargetList:\r
+            File = Item.Target.Path.replace('\\', '/').strip('/').replace(DebugDir, '').replace(OutputDir, '').strip('/')\r
+            if File not in self.OutputFile:\r
+                self.OutputFile.append(File)\r
+            if os.path.isabs(File):\r
+                File = File.replace('\\', '/').strip('/').replace(OutputDir, '').strip('/')\r
+            if Item.Target.Ext.lower() == '.aml':\r
+                AsBuiltInfDict['binary_item'] += ['ASL|' + File]\r
+            elif Item.Target.Ext.lower() == '.acpi':\r
+                AsBuiltInfDict['binary_item'] += ['ACPI|' + File]\r
+            elif Item.Target.Ext.lower() == '.efi':\r
+                AsBuiltInfDict['binary_item'] += ['PE32|' + self.Name + '.efi']\r
             else:\r
-              AsBuiltInfDict['binary_item'] += ['BIN|' + File]\r
-          if self.DepexGenerated:\r
+                AsBuiltInfDict['binary_item'] += ['BIN|' + File]\r
+        if self.DepexGenerated:\r
+            if self.Name + '.depex' not in self.OutputFile:\r
+                self.OutputFile.append(self.Name + '.depex')\r
             if self.ModuleType in ['PEIM']:\r
-              AsBuiltInfDict['binary_item'] += ['PEI_DEPEX|' + self.Name + '.depex']\r
-            if self.ModuleType in ['DXE_DRIVER','DXE_RUNTIME_DRIVER','DXE_SAL_DRIVER','UEFI_DRIVER']:\r
-              AsBuiltInfDict['binary_item'] += ['DXE_DEPEX|' + self.Name + '.depex']\r
+                AsBuiltInfDict['binary_item'] += ['PEI_DEPEX|' + self.Name + '.depex']\r
+            if self.ModuleType in ['DXE_DRIVER', 'DXE_RUNTIME_DRIVER', 'DXE_SAL_DRIVER', 'UEFI_DRIVER']:\r
+                AsBuiltInfDict['binary_item'] += ['DXE_DEPEX|' + self.Name + '.depex']\r
             if self.ModuleType in ['DXE_SMM_DRIVER']:\r
-              AsBuiltInfDict['binary_item'] += ['SMM_DEPEX|' + self.Name + '.depex']\r
+                AsBuiltInfDict['binary_item'] += ['SMM_DEPEX|' + self.Name + '.depex']\r
 \r
         Bin = self._GenOffsetBin()\r
         if Bin:\r
             AsBuiltInfDict['binary_item'] += ['BIN|%s' % Bin]\r
+            if Bin not in self.OutputFile:\r
+                self.OutputFile.append(Bin)\r
 \r
         for Root, Dirs, Files in os.walk(OutputDir):\r
             for File in Files:\r
                 if File.lower().endswith('.pdb'):\r
                     AsBuiltInfDict['binary_item'] += ['DISPOSABLE|' + File]\r
+                    if File not in self.OutputFile:\r
+                        self.OutputFile.append(File)\r
         HeaderComments = self.Module.HeaderComments\r
         StartPos = 0\r
         for Index in range(len(HeaderComments)):\r
@@ -3378,12 +4143,26 @@ class ModuleAutoGen(AutoGen):
                             os.path.join(self.OutputDir, self.Name + '.efi')\r
                         )\r
         if PatchList:\r
-            for PatchPcd in PatchList:\r
-                if PatchPcd[0] not in PatchablePcds:\r
+            for Pcd in PatchablePcds:\r
+                TokenCName = Pcd.TokenCName\r
+                for PcdItem in GlobalData.MixedPcd:\r
+                    if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
+                        TokenCName = PcdItem[0]\r
+                        break\r
+                for PatchPcd in PatchList:\r
+                    if TokenCName == PatchPcd[0]:\r
+                        break\r
+                else:\r
                     continue\r
-                Pcd = PatchablePcds[PatchPcd[0]]\r
                 PcdValue = ''\r
-                if Pcd.DatumType != 'VOID*':\r
+                if Pcd.DatumType == 'BOOLEAN':\r
+                    BoolValue = Pcd.DefaultValue.upper()\r
+                    if BoolValue == 'TRUE':\r
+                        Pcd.DefaultValue = '1'\r
+                    elif BoolValue == 'FALSE':\r
+                        Pcd.DefaultValue = '0'\r
+\r
+                if Pcd.DatumType in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN']:\r
                     HexFormat = '0x%02x'\r
                     if Pcd.DatumType == 'UINT16':\r
                         HexFormat = '0x%04x'\r
@@ -3395,7 +4174,7 @@ class ModuleAutoGen(AutoGen):
                 else:\r
                     if Pcd.MaxDatumSize == None or Pcd.MaxDatumSize == '':\r
                         EdkLogger.error("build", AUTOGEN_ERROR,\r
-                                        "Unknown [MaxDatumSize] of PCD [%s.%s]" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+                                        "Unknown [MaxDatumSize] of PCD [%s.%s]" % (Pcd.TokenSpaceGuidCName, TokenCName)\r
                                         )\r
                     ArraySize = int(Pcd.MaxDatumSize, 0)\r
                     PcdValue = Pcd.DefaultValue\r
@@ -3419,7 +4198,7 @@ class ModuleAutoGen(AutoGen):
                             ArraySize = ArraySize / 2\r
                         if ArraySize < (len(PcdValue) + 1):\r
                             EdkLogger.error("build", AUTOGEN_ERROR,\r
-                                            "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+                                            "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, TokenCName)\r
                                             )\r
                         if ArraySize > len(PcdValue) + 1:\r
                             NewValue = NewValue + Padding * (ArraySize - len(PcdValue) - 1)\r
@@ -3429,10 +4208,10 @@ class ModuleAutoGen(AutoGen):
                         PcdValue += '}'\r
                     else:\r
                         EdkLogger.error("build", AUTOGEN_ERROR,\r
-                                        "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+                                        "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, TokenCName)\r
                                         )\r
                 PcdItem = '%s.%s|%s|0x%X' % \\r
-                    (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, PcdValue, PatchPcd[1])\r
+                    (Pcd.TokenSpaceGuidCName, TokenCName, PcdValue, PatchPcd[1])\r
                 PcdComments = ''\r
                 if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) in self._PcdComments:\r
                     PcdComments = '\n  '.join(self._PcdComments[Pcd.TokenSpaceGuidCName, Pcd.TokenCName])\r
@@ -3446,6 +4225,11 @@ class ModuleAutoGen(AutoGen):
             PcdCommentList = []\r
             HiiInfo = ''\r
             SkuId = ''\r
+            TokenCName = Pcd.TokenCName\r
+            for PcdItem in GlobalData.MixedPcd:\r
+                if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
+                    TokenCName = PcdItem[0]\r
+                    break\r
             if Pcd.Type == TAB_PCDS_DYNAMIC_EX_HII:\r
                 for SkuName in Pcd.SkuInfoList:\r
                     SkuInfo = Pcd.SkuInfoList[SkuName]\r
@@ -3476,18 +4260,28 @@ class ModuleAutoGen(AutoGen):
                 else:\r
                     PcdCommentList.append('## UNDEFINED ' + HiiInfo)\r
             PcdComments = '\n  '.join(PcdCommentList)\r
-            PcdEntry = Pcd.TokenSpaceGuidCName + '.' + Pcd.TokenCName\r
+            PcdEntry = Pcd.TokenSpaceGuidCName + '.' + TokenCName\r
             if PcdComments:\r
                 PcdEntry = PcdComments + '\n  ' + PcdEntry\r
             AsBuiltInfDict['pcd_item'] += [PcdEntry]\r
         for Item in self.BuildOption:\r
-          if 'FLAGS' in self.BuildOption[Item]:\r
-            AsBuiltInfDict['flags_item'] += ['%s:%s_%s_%s_%s_FLAGS = %s' % (self.ToolChainFamily, self.BuildTarget, self.ToolChain, self.Arch, Item, self.BuildOption[Item]['FLAGS'].strip())]\r
+            if 'FLAGS' in self.BuildOption[Item]:\r
+                AsBuiltInfDict['flags_item'] += ['%s:%s_%s_%s_%s_FLAGS = %s' % (self.ToolChainFamily, self.BuildTarget, self.ToolChain, self.Arch, Item, self.BuildOption[Item]['FLAGS'].strip())]\r
 \r
         # Generated LibraryClasses section in comments.\r
         for Library in self.LibraryAutoGenList:\r
             AsBuiltInfDict['libraryclasses_item'] += [Library.MetaFile.File.replace('\\', '/')]\r
         \r
+        # Generated UserExtensions TianoCore section.\r
+        # All tianocore user extensions are copied.\r
+        UserExtStr = ''\r
+        for TianoCore in self._GetTianoCoreUserExtensionList():\r
+            UserExtStr += '\n'.join(TianoCore)\r
+            ExtensionFile = os.path.join(self.MetaFile.Dir, TianoCore[1])\r
+            if os.path.isfile(ExtensionFile):\r
+                shutil.copy2(ExtensionFile, self.OutputDir)\r
+        AsBuiltInfDict['userextension_tianocore_item'] = UserExtStr\r
+\r
         # Generated depex expression section in comments.\r
         AsBuiltInfDict['depexsection_item'] = ''\r
         DepexExpresion = self._GetDepexExpresionString()\r
@@ -3500,24 +4294,72 @@ class ModuleAutoGen(AutoGen):
         SaveFileOnChange(os.path.join(self.OutputDir, self.Name + '.inf'), str(AsBuiltInf), False)\r
         \r
         self.IsAsBuiltInfCreated = True\r
-        \r
+        if GlobalData.gBinCacheDest:\r
+            self.CopyModuleToCache()\r
+\r
+    def CopyModuleToCache(self):\r
+        FileDir = path.join(GlobalData.gBinCacheDest, self.Arch, self.SourceDir, self.MetaFile.BaseName)\r
+        CreateDirectory (FileDir)\r
+        HashFile = path.join(self.BuildDir, self.Name + '.hash')\r
+        ModuleFile = path.join(self.OutputDir, self.Name + '.inf')\r
+        if os.path.exists(HashFile):\r
+            shutil.copy2(HashFile, FileDir)\r
+        if os.path.exists(ModuleFile):\r
+            shutil.copy2(ModuleFile, FileDir)\r
+        if not self.OutputFile:\r
+            Ma = self.Workspace.BuildDatabase[PathClass(ModuleFile), self.Arch, self.BuildTarget, self.ToolChain]\r
+            self.OutputFile = Ma.Binaries\r
+        if self.OutputFile:\r
+            for File in self.OutputFile:\r
+                File = str(File)\r
+                if not os.path.isabs(File):\r
+                    File = os.path.join(self.OutputDir, File)\r
+                if os.path.exists(File):\r
+                    shutil.copy2(File, FileDir)\r
+\r
+    def AttemptModuleCacheCopy(self):\r
+        if self.IsBinaryModule:\r
+            return False\r
+        FileDir = path.join(GlobalData.gBinCacheSource, self.Arch, self.SourceDir, self.MetaFile.BaseName)\r
+        HashFile = path.join(FileDir, self.Name + '.hash')\r
+        if os.path.exists(HashFile):\r
+            f = open(HashFile, 'r')\r
+            CacheHash = f.read()\r
+            f.close()\r
+            if GlobalData.gModuleHash[self.Arch][self.Name]:\r
+                if CacheHash == GlobalData.gModuleHash[self.Arch][self.Name]:\r
+                    for root, dir, files in os.walk(FileDir):\r
+                        for f in files:\r
+                            if self.Name + '.hash' in f:\r
+                                shutil.copy2(HashFile, self.BuildDir)\r
+                            else:\r
+                                File = path.join(root, f)\r
+                                shutil.copy2(File, self.OutputDir)\r
+                    if self.Name == "PcdPeim" or self.Name == "PcdDxe":\r
+                        CreatePcdDatabaseCode(self, TemplateString(), TemplateString())\r
+                    return True\r
+        return False\r
+\r
     ## Create makefile for the module and its dependent libraries\r
     #\r
     #   @param      CreateLibraryMakeFile   Flag indicating if or not the makefiles of\r
     #                                       dependent libraries will be created\r
     #\r
-    def CreateMakeFile(self, CreateLibraryMakeFile=True):\r
+    def CreateMakeFile(self, CreateLibraryMakeFile=True, GenFfsList = []):\r
         # Ignore generating makefile when it is a binary module\r
         if self.IsBinaryModule:\r
             return\r
 \r
         if self.IsMakeFileCreated:\r
             return\r
-\r
+        self.GenFfsList = GenFfsList\r
         if not self.IsLibrary and CreateLibraryMakeFile:\r
             for LibraryAutoGen in self.LibraryAutoGenList:\r
                 LibraryAutoGen.CreateMakeFile()\r
 \r
+        if self.CanSkip():\r
+            return\r
+\r
         if len(self.CustomMakefile) == 0:\r
             Makefile = GenMake.ModuleMakefile(self)\r
         else:\r
@@ -3529,6 +4371,7 @@ class ModuleAutoGen(AutoGen):
             EdkLogger.debug(EdkLogger.DEBUG_9, "Skipped the generation of makefile for module %s [%s]" %\r
                             (self.Name, self.Arch))\r
 \r
+        self.CreateTimeStamp(Makefile)\r
         self.IsMakeFileCreated = True\r
 \r
     def CopyBinaryFiles(self):\r
@@ -3558,6 +4401,9 @@ class ModuleAutoGen(AutoGen):
             for LibraryAutoGen in self.LibraryAutoGenList:\r
                 LibraryAutoGen.CreateCodeFile()\r
 \r
+        if self.CanSkip():\r
+            return\r
+\r
         AutoGenList = []\r
         IgoredAutoGenList = []\r
 \r
@@ -3623,6 +4469,101 @@ class ModuleAutoGen(AutoGen):
                         self._ApplyBuildRule(Lib.Target, TAB_UNKNOWN_FILE)\r
         return self._LibraryAutoGenList\r
 \r
+    def GenModuleHash(self):\r
+        if self.Arch not in GlobalData.gModuleHash:\r
+            GlobalData.gModuleHash[self.Arch] = {}\r
+        m = hashlib.md5()\r
+        # Add Platform level hash\r
+        m.update(GlobalData.gPlatformHash)\r
+        # Add Package level hash\r
+        if self.DependentPackageList:\r
+            for Pkg in self.DependentPackageList:\r
+                if Pkg.PackageName in GlobalData.gPackageHash[self.Arch]:\r
+                    m.update(GlobalData.gPackageHash[self.Arch][Pkg.PackageName])\r
+\r
+        # Add Library hash\r
+        if self.LibraryAutoGenList:\r
+            for Lib in self.LibraryAutoGenList:\r
+                if Lib.Name not in GlobalData.gModuleHash[self.Arch]:\r
+                    Lib.GenModuleHash()\r
+                m.update(GlobalData.gModuleHash[self.Arch][Lib.Name])\r
+\r
+        # Add Module self\r
+        f = open(str(self.MetaFile), 'r')\r
+        Content = f.read()\r
+        f.close()\r
+        m.update(Content)\r
+        # Add Module's source files\r
+        if self.SourceFileList:\r
+            for File in self.SourceFileList:\r
+                f = open(str(File), 'r')\r
+                Content = f.read()\r
+                f.close()\r
+                m.update(Content)\r
+\r
+        ModuleHashFile = path.join(self.BuildDir, self.Name + ".hash")\r
+        if self.Name not in GlobalData.gModuleHash[self.Arch]:\r
+            GlobalData.gModuleHash[self.Arch][self.Name] = m.hexdigest()\r
+        if GlobalData.gBinCacheSource:\r
+            CacheValid = self.AttemptModuleCacheCopy()\r
+            if CacheValid:\r
+                return False\r
+        return SaveFileOnChange(ModuleHashFile, m.hexdigest(), True)\r
+\r
+    ## Decide whether we can skip the ModuleAutoGen process\r
+    def CanSkipbyHash(self):\r
+        if GlobalData.gUseHashCache:\r
+            return not self.GenModuleHash()\r
+\r
+    ## Decide whether we can skip the ModuleAutoGen process\r
+    #  If any source file is newer than the module than we cannot skip\r
+    #\r
+    def CanSkip(self):\r
+        if not os.path.exists(self.GetTimeStampPath()):\r
+            return False\r
+        #last creation time of the module\r
+        DstTimeStamp = os.stat(self.GetTimeStampPath())[8]\r
+\r
+        SrcTimeStamp = self.Workspace._SrcTimeStamp\r
+        if SrcTimeStamp > DstTimeStamp:\r
+            return False\r
+\r
+        with open(self.GetTimeStampPath(),'r') as f:\r
+            for source in f:\r
+                source = source.rstrip('\n')\r
+                if not os.path.exists(source):\r
+                    return False\r
+                if source not in ModuleAutoGen.TimeDict :\r
+                    ModuleAutoGen.TimeDict[source] = os.stat(source)[8]\r
+                if ModuleAutoGen.TimeDict[source] > DstTimeStamp:\r
+                    return False\r
+        return True\r
+\r
+    def GetTimeStampPath(self):\r
+        if self._TimeStampPath == None:\r
+            self._TimeStampPath = os.path.join(self.MakeFileDir, 'AutoGenTimeStamp')\r
+        return self._TimeStampPath\r
+    def CreateTimeStamp(self, Makefile):\r
+\r
+        FileSet = set()\r
+\r
+        FileSet.add (self.MetaFile.Path)\r
+\r
+        for SourceFile in self.Module.Sources:\r
+            FileSet.add (SourceFile.Path)\r
+\r
+        for Lib in self.DependentLibraryList:\r
+            FileSet.add (Lib.MetaFile.Path)\r
+\r
+        for f in self.AutoGenDepSet:\r
+            FileSet.add (f.Path)\r
+\r
+        if os.path.exists (self.GetTimeStampPath()):\r
+            os.remove (self.GetTimeStampPath())\r
+        with open(self.GetTimeStampPath(), 'w+') as file:\r
+            for f in FileSet:\r
+                print >> file, f\r
+\r
     Module          = property(_GetModule)\r
     Name            = property(_GetBaseName)\r
     Guid            = property(_GetGuid)\r
@@ -3639,13 +4580,16 @@ class ModuleAutoGen(AutoGen):
     IsBinaryModule  = property(_IsBinaryModule)\r
     BuildDir        = property(_GetBuildDir)\r
     OutputDir       = property(_GetOutputDir)\r
+    FfsOutputDir    = property(_GetFfsOutputDir)\r
     DebugDir        = property(_GetDebugDir)\r
     MakeFileDir     = property(_GetMakeFileDir)\r
     CustomMakefile  = property(_GetCustomMakefile)\r
 \r
     IncludePathList = property(_GetIncludePathList)\r
+    IncludePathLength = property(_GetIncludePathLength)\r
     AutoGenFileList = property(_GetAutoGenFileList)\r
     UnicodeFileList = property(_GetUnicodeFileList)\r
+    VfrFileList     = property(_GetVfrFileList)\r
     SourceFileList  = property(_GetSourceFileList)\r
     BinaryFileList  = property(_GetBinaryFiles) # FileType : [File List]\r
     Targets         = property(_GetTargets)\r
@@ -3653,6 +4597,7 @@ class ModuleAutoGen(AutoGen):
     CodaTargetList  = property(_GetFinalTargetList)\r
     FileTypes       = property(_GetFileTypes)\r
     BuildRules      = property(_GetBuildRules)\r
+    IdfFileList     = property(_GetIdfFileList)\r
 \r
     DependentPackageList    = property(_GetDependentPackageList)\r
     DependentLibraryList    = property(_GetLibraryList)\r