]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/AutoGen/AutoGen.py
MdeModulePkg/NonDiscoverablePciDevice: Remove the redundant check
[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py
index cef5aeaf3ecb631fdef4a44a4fa4b50621de7249..d646cd50ce8e8101538b0eaf098de4c1e07b01e3 100644 (file)
@@ -278,10 +278,6 @@ class WorkspaceAutoGen(AutoGen):
         self.FvTargetList   = Fvs if Fvs else []\r
         self.CapTargetList  = Caps if Caps else []\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
@@ -573,8 +569,8 @@ class WorkspaceAutoGen(AutoGen):
                         'build',\r
                         PARSER_ERROR,\r
                         "PCD (%s.%s) used in FDF is not declared in DEC files." % (Guid, Name),\r
-                        File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],\r
-                        Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]\r
+                        File = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][0],\r
+                        Line = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][1]\r
                     )\r
                 else:\r
                     # Check whether Dynamic or DynamicEx PCD used in FDF file. If used, build break and give a error message.\r
@@ -587,8 +583,8 @@ class WorkspaceAutoGen(AutoGen):
                                 'build',\r
                                 PARSER_ERROR,\r
                                 "Using Dynamic or DynamicEx type of PCD [%s.%s] in FDF file is not allowed." % (Guid, Name),\r
-                                File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],\r
-                                Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]\r
+                                File = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][0],\r
+                                Line = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][1]\r
                         )\r
 \r
             Pa = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
@@ -810,54 +806,56 @@ class WorkspaceAutoGen(AutoGen):
         return "%s [%s]" % (self.MetaFile, ", ".join(self.ArchList))\r
 \r
     ## Return the directory to store FV files\r
-    def _GetFvDir(self):\r
-        if self._FvDir is None:\r
-            self._FvDir = path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
-        return self._FvDir\r
+    @cached_property\r
+    def FvDir(self):\r
+        return path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
 \r
     ## Return the directory to store all intermediate and final files built\r
-    def _GetBuildDir(self):\r
-        if self._BuildDir is None:\r
-            return self.AutoGenObjectList[0].BuildDir\r
+    @cached_property\r
+    def BuildDir(self):\r
+        return self.AutoGenObjectList[0].BuildDir\r
 \r
     ## Return the build output directory platform specifies\r
-    def _GetOutputDir(self):\r
+    @cached_property\r
+    def OutputDir(self):\r
         return self.Platform.OutputDirectory\r
 \r
     ## Return platform name\r
-    def _GetName(self):\r
+    @cached_property\r
+    def Name(self):\r
         return self.Platform.PlatformName\r
 \r
     ## Return meta-file GUID\r
-    def _GetGuid(self):\r
+    @cached_property\r
+    def Guid(self):\r
         return self.Platform.Guid\r
 \r
     ## Return platform version\r
-    def _GetVersion(self):\r
+    @cached_property\r
+    def Version(self):\r
         return self.Platform.Version\r
 \r
     ## Return paths of tools\r
-    def _GetToolDefinition(self):\r
+    @cached_property\r
+    def ToolDefinition(self):\r
         return self.AutoGenObjectList[0].ToolDefinition\r
 \r
     ## Return directory of platform makefile\r
     #\r
     #   @retval     string  Makefile directory\r
     #\r
-    def _GetMakeFileDir(self):\r
-        if self._MakeFileDir is None:\r
-            self._MakeFileDir = self.BuildDir\r
-        return self._MakeFileDir\r
+    @cached_property\r
+    def MakeFileDir(self):\r
+        return self.BuildDir\r
 \r
     ## Return build command string\r
     #\r
     #   @retval     string  Build command string\r
     #\r
-    def _GetBuildCommand(self):\r
-        if self._BuildCommand is None:\r
-            # 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
+    @cached_property\r
+    def BuildCommand(self):\r
+        # BuildCommand should be all the same. So just get one from platform AutoGen\r
+        return self.AutoGenObjectList[0].BuildCommand\r
 \r
     ## Check the PCDs token value conflict in each DEC file.\r
     #\r
@@ -933,9 +931,14 @@ class WorkspaceAutoGen(AutoGen):
                                     )\r
                     Count += 1\r
     ## Generate fds command\r
-    def _GenFdsCommand(self):\r
+    @property\r
+    def GenFdsCommand(self):\r
         return (GenMake.TopLevelMakefile(self)._TEMPLATE_.Replace(GenMake.TopLevelMakefile(self)._TemplateDict)).strip()\r
 \r
+    @property\r
+    def GenFdsCommandDict(self):\r
+        return GenMake.TopLevelMakefile(self)._TemplateDict\r
+\r
     ## Create makefile for the platform and modules in it\r
     #\r
     #   @param      CreateDepsMakeFile      Flag indicating if the makefile for\r
@@ -966,18 +969,6 @@ class WorkspaceAutoGen(AutoGen):
     def CreateAsBuiltInf(self):\r
         return\r
 \r
-    Name                = property(_GetName)\r
-    Guid                = property(_GetGuid)\r
-    Version             = property(_GetVersion)\r
-    OutputDir           = property(_GetOutputDir)\r
-\r
-    ToolDefinition      = property(_GetToolDefinition)       # toolcode : tool path\r
-\r
-    BuildDir            = property(_GetBuildDir)\r
-    FvDir               = property(_GetFvDir)\r
-    MakeFileDir         = property(_GetMakeFileDir)\r
-    BuildCommand        = property(_GetBuildCommand)\r
-    GenFdsCommand       = property(_GenFdsCommand)\r
 \r
 ## AutoGen class for platform\r
 #\r
@@ -1098,21 +1089,19 @@ class PlatformAutoGen(AutoGen):
     def GenFdsCommand(self):\r
         return self.Workspace.GenFdsCommand\r
 \r
-    ## Create makefile for the platform and mdoules in it\r
+    ## Create makefile for the platform and modules 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, 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
-                if (ModuleFile.File, self.Arch) in FfsCommand:\r
-                    Ma.CreateMakeFile(True, FfsCommand[ModuleFile.File, self.Arch])\r
+            for Ma in self._MaList:\r
+                key = (Ma.MetaFile.File, self.Arch)\r
+                if key in FfsCommand:\r
+                    Ma.CreateMakeFile(True, FfsCommand[key])\r
                 else:\r
                     Ma.CreateMakeFile(True)\r
-                #Ma.CreateAsBuiltInf()\r
 \r
         # no need to create makefile for the platform more than once\r
         if self.IsMakeFileCreated:\r
@@ -1168,7 +1157,7 @@ class PlatformAutoGen(AutoGen):
                         VpdRegionBase = FdRegion.Offset\r
                         break\r
 \r
-        VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(), self.DscBuildDataObj._GetSkuIds())\r
+        VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(), self.DscBuildDataObj.SkuIds)\r
         VariableInfo.SetVpdRegionMaxSize(VpdRegionSize)\r
         VariableInfo.SetVpdRegionOffset(VpdRegionBase)\r
         Index = 0\r
@@ -1180,10 +1169,12 @@ class PlatformAutoGen(AutoGen):
                 if SkuId is None or SkuId == '':\r
                     continue\r
                 if len(Sku.VariableName) > 0:\r
+                    if Sku.VariableAttribute and 'NV' not in Sku.VariableAttribute:\r
+                        continue\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
+                        VariableInfo.append_variable(var_info(Index, pcdname, StorageName, SkuName, StringToArray(Sku.VariableName), VariableGuid, Sku.VariableOffset, Sku.VariableAttribute, Sku.HiiDefaultValue, Sku.DefaultStoreDict[StorageName] if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES else StringToArray(Sku.DefaultStoreDict[StorageName]), Pcd.DatumType, Pcd.CustomAttribute['DscPosition'], Pcd.CustomAttribute.get('IsStru',False)))\r
             Index += 1\r
         return VariableInfo\r
 \r
@@ -1244,16 +1235,12 @@ class PlatformAutoGen(AutoGen):
         for InfName in self._AsBuildInfList:\r
             InfName = mws.join(self.WorkspaceDir, InfName)\r
             FdfModuleList.append(os.path.normpath(InfName))\r
-        for F in self.Platform.Modules.keys():\r
-            M = ModuleAutoGen(self.Workspace, F, self.BuildTarget, self.ToolChain, self.Arch, self.MetaFile)\r
-            #GuidValue.update(M.Guids)\r
-\r
-            self.Platform.Modules[F].M = M\r
-\r
+        for M in self._MaList:\r
+#            F is the Module for which M is the module autogen\r
             for PcdFromModule in M.ModulePcdList + M.LibraryPcdList:\r
                 # make sure that the "VOID*" kind of datum has MaxDatumSize set\r
                 if PcdFromModule.DatumType == TAB_VOID and not PcdFromModule.MaxDatumSize:\r
-                    NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, F))\r
+                    NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, M.MetaFile))\r
 \r
                 # Check the PCD from Binary INF or Source INF\r
                 if M.IsBinaryModule == True:\r
@@ -1263,7 +1250,7 @@ class PlatformAutoGen(AutoGen):
                 PcdFromModule.IsFromDsc = (PcdFromModule.TokenCName, PcdFromModule.TokenSpaceGuidCName) in self.Platform.Pcds\r
 \r
                 if PcdFromModule.Type in PCD_DYNAMIC_TYPE_SET or PcdFromModule.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
-                    if F.Path not in FdfModuleList:\r
+                    if M.MetaFile.Path not in FdfModuleList:\r
                         # If one of the Source built modules listed in the DSC is not listed\r
                         # in FDF modules, and the INF lists a PCD can only use the PcdsDynamic\r
                         # access method (it is only listed in the DEC file that declares the\r
@@ -1416,6 +1403,13 @@ class PlatformAutoGen(AutoGen):
                 self.VariableInfo = self.CollectVariables(self._DynamicPcdList)\r
                 vardump = self.VariableInfo.dump()\r
                 if vardump:\r
+                    #\r
+                    #According to PCD_DATABASE_INIT in edk2\MdeModulePkg\Include\Guid\PcdDataBaseSignatureGuid.h,\r
+                    #the max size for string PCD should not exceed USHRT_MAX 65535(0xffff).\r
+                    #typedef UINT16 SIZE_INFO;\r
+                    #//SIZE_INFO  SizeTable[];\r
+                    if len(vardump.split(",")) > 0xffff:\r
+                        EdkLogger.error("build", RESOURCE_OVERFLOW, 'The current length of PCD %s value is %d, it exceeds to the max size of String PCD.' %(".".join([PcdNvStoreDfBuffer.TokenSpaceGuidCName,PcdNvStoreDfBuffer.TokenCName]) ,len(vardump.split(","))))\r
                     PcdNvStoreDfBuffer.DefaultValue = vardump\r
                     for skuname in PcdNvStoreDfBuffer.SkuInfoList:\r
                         PcdNvStoreDfBuffer.SkuInfoList[skuname].DefaultValue = vardump\r
@@ -1448,7 +1442,7 @@ class PlatformAutoGen(AutoGen):
                         PcdValue = Sku.DefaultValue\r
                         if PcdValue == "":\r
                             PcdValue  = Pcd.DefaultValue\r
-                        if Sku.VpdOffset != '*':\r
+                        if Sku.VpdOffset != TAB_STAR:\r
                             if PcdValue.startswith("{"):\r
                                 Alignment = 8\r
                             elif PcdValue.startswith("L"):\r
@@ -1472,7 +1466,7 @@ class PlatformAutoGen(AutoGen):
                             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
+                        if not NeedProcessVpdMapFile and Sku.VpdOffset == TAB_STAR:\r
                             NeedProcessVpdMapFile = True\r
                             if self.Platform.VpdToolGuid is None or self.Platform.VpdToolGuid == '':\r
                                 EdkLogger.error("Build", FILE_NOT_FOUND, \\r
@@ -1532,7 +1526,7 @@ class PlatformAutoGen(AutoGen):
                                 PcdValue = Sku.DefaultValue\r
                                 if PcdValue == "":\r
                                     PcdValue  = DscPcdEntry.DefaultValue\r
-                                if Sku.VpdOffset != '*':\r
+                                if Sku.VpdOffset != TAB_STAR:\r
                                     if PcdValue.startswith("{"):\r
                                         Alignment = 8\r
                                     elif PcdValue.startswith("L"):\r
@@ -1555,7 +1549,7 @@ class PlatformAutoGen(AutoGen):
                                     SkuValueMap[PcdValue] = []\r
                                     VpdFile.Add(DscPcdEntry, SkuName, Sku.VpdOffset)\r
                                 SkuValueMap[PcdValue].append(Sku)\r
-                                if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
+                                if not NeedProcessVpdMapFile and Sku.VpdOffset == TAB_STAR:\r
                                     NeedProcessVpdMapFile = True\r
                             if DscPcdEntry.DatumType == TAB_VOID and PcdValue.startswith("L"):\r
                                 UnicodePcdArray.add(DscPcdEntry)\r
@@ -1576,6 +1570,12 @@ class PlatformAutoGen(AutoGen):
                 self.FixVpdOffset(VpdFile)\r
 \r
                 self.FixVpdOffset(self.UpdateNVStoreMaxSize(VpdFile))\r
+                PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if item.TokenCName == "PcdNvStoreDefaultValueBuffer" and item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]\r
+                if PcdNvStoreDfBuffer:\r
+                    PcdName,PcdGuid = PcdNvStoreDfBuffer[0].TokenCName, PcdNvStoreDfBuffer[0].TokenSpaceGuidCName\r
+                    if (PcdName,PcdGuid) in VpdSkuMap:\r
+                        DefaultSku = PcdNvStoreDfBuffer[0].SkuInfoList.get(TAB_DEFAULT)\r
+                        VpdSkuMap[(PcdName,PcdGuid)] = {DefaultSku.DefaultValue:[DefaultSku]}\r
 \r
                 # Process VPD map file generated by third party BPDG tool\r
                 if NeedProcessVpdMapFile:\r
@@ -1583,7 +1583,7 @@ class PlatformAutoGen(AutoGen):
                     if os.path.exists(VpdMapFilePath):\r
                         VpdFile.Read(VpdMapFilePath)\r
 \r
-                        # Fixup "*" offset\r
+                        # Fixup TAB_STAR offset\r
                         for pcd in VpdSkuMap:\r
                             vpdinfo = VpdFile.GetVpdInfo(pcd)\r
                             if vpdinfo is None:\r
@@ -1893,15 +1893,17 @@ class PlatformAutoGen(AutoGen):
         return {(Pcd.TokenCName, Pcd.TokenSpaceGuidCName):Pcd for Pcd in self.NonDynamicPcdList}\r
 \r
     ## Get list of non-dynamic PCDs\r
-    @cached_property\r
+    @property\r
     def NonDynamicPcdList(self):\r
-        self.CollectPlatformDynamicPcds()\r
+        if not self._NonDynamicPcdList:\r
+            self.CollectPlatformDynamicPcds()\r
         return self._NonDynamicPcdList\r
 \r
     ## Get list of dynamic PCDs\r
-    @cached_property\r
+    @property\r
     def DynamicPcdList(self):\r
-        self.CollectPlatformDynamicPcds()\r
+        if not self._DynamicPcdList:\r
+            self.CollectPlatformDynamicPcds()\r
         return self._DynamicPcdList\r
 \r
     ## Generate Token Number for all PCD\r
@@ -1947,19 +1949,25 @@ class PlatformAutoGen(AutoGen):
             TokenNumber += 1\r
         return RetVal\r
 \r
+    @cached_property\r
+    def _MaList(self):\r
+        for ModuleFile in self.Platform.Modules:\r
+            Ma = ModuleAutoGen(\r
+                  self.Workspace,\r
+                  ModuleFile,\r
+                  self.BuildTarget,\r
+                  self.ToolChain,\r
+                  self.Arch,\r
+                  self.MetaFile\r
+                  )\r
+            self.Platform.Modules[ModuleFile].M = Ma\r
+        return [x.M for x in self.Platform.Modules.values()]\r
+\r
     ## Summarize ModuleAutoGen objects of all modules to be built for this platform\r
     @cached_property\r
     def ModuleAutoGenList(self):\r
         RetVal = []\r
-        for ModuleFile in self.Platform.Modules:\r
-            Ma = ModuleAutoGen(\r
-                    self.Workspace,\r
-                    ModuleFile,\r
-                    self.BuildTarget,\r
-                    self.ToolChain,\r
-                    self.Arch,\r
-                    self.MetaFile\r
-                    )\r
+        for Ma in self._MaList:\r
             if Ma not in RetVal:\r
                 RetVal.append(Ma)\r
         return RetVal\r
@@ -1968,15 +1976,7 @@ class PlatformAutoGen(AutoGen):
     @cached_property\r
     def LibraryAutoGenList(self):\r
         RetVal = []\r
-        for ModuleFile in self.Platform.Modules:\r
-            Ma = ModuleAutoGen(\r
-                    self.Workspace,\r
-                    ModuleFile,\r
-                    self.BuildTarget,\r
-                    self.ToolChain,\r
-                    self.Arch,\r
-                    self.MetaFile\r
-                    )\r
+        for Ma in self._MaList:\r
             for La in Ma.LibraryAutoGenList:\r
                 if La not in RetVal:\r
                     RetVal.append(La)\r
@@ -2078,6 +2078,7 @@ class PlatformAutoGen(AutoGen):
             ToPcd.validateranges = FromPcd.validateranges\r
             ToPcd.validlists = FromPcd.validlists\r
             ToPcd.expressions = FromPcd.expressions\r
+            ToPcd.CustomAttribute = FromPcd.CustomAttribute\r
 \r
         if FromPcd is not None and ToPcd.DatumType == TAB_VOID and not ToPcd.MaxDatumSize:\r
             EdkLogger.debug(EdkLogger.DEBUG_9, "No MaxDatumSize specified for PCD %s.%s" \\r
@@ -2140,6 +2141,13 @@ class PlatformAutoGen(AutoGen):
         if Module in self.Platform.Modules:\r
             PlatformModule = self.Platform.Modules[str(Module)]\r
             for Key  in PlatformModule.Pcds:\r
+                if GlobalData.BuildOptionPcd:\r
+                    for pcd in GlobalData.BuildOptionPcd:\r
+                        (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, _) = pcd\r
+                        if (TokenCName, TokenSpaceGuidCName) == Key and FieldName =="":\r
+                            PlatformModule.Pcds[Key].DefaultValue = pcdvalue\r
+                            PlatformModule.Pcds[Key].PcdValueFromComm = pcdvalue\r
+                            break\r
                 Flag = False\r
                 if Key in Pcds:\r
                     ToPcd = Pcds[Key]\r
@@ -2214,15 +2222,15 @@ class PlatformAutoGen(AutoGen):
     def CalculatePriorityValue(self, Key):\r
         Target, ToolChain, Arch, CommandType, Attr = Key.split('_')\r
         PriorityValue = 0x11111\r
-        if Target == "*":\r
+        if Target == TAB_STAR:\r
             PriorityValue &= 0x01111\r
-        if ToolChain == "*":\r
+        if ToolChain == TAB_STAR:\r
             PriorityValue &= 0x10111\r
-        if Arch == "*":\r
+        if Arch == TAB_STAR:\r
             PriorityValue &= 0x11011\r
-        if CommandType == "*":\r
+        if CommandType == TAB_STAR:\r
             PriorityValue &= 0x11101\r
-        if Attr == "*":\r
+        if Attr == TAB_STAR:\r
             PriorityValue &= 0x11110\r
 \r
         return self.PrioList["0x%0.5x" % PriorityValue]\r
@@ -2257,9 +2265,9 @@ class PlatformAutoGen(AutoGen):
             if (Key[0] == self.BuildRuleFamily and\r
                 (ModuleStyle is None or len(Key) < 3 or (len(Key) > 2 and Key[2] == ModuleStyle))):\r
                 Target, ToolChain, Arch, CommandType, Attr = Key[1].split('_')\r
-                if (Target == self.BuildTarget or Target == "*") and\\r
-                    (ToolChain == self.ToolChain or ToolChain == "*") and\\r
-                    (Arch == self.Arch or Arch == "*") and\\r
+                if (Target == self.BuildTarget or Target == TAB_STAR) and\\r
+                    (ToolChain == self.ToolChain or ToolChain == TAB_STAR) and\\r
+                    (Arch == self.Arch or Arch == TAB_STAR) and\\r
                     Options[Key].startswith("="):\r
 \r
                     if OverrideList.get(Key[1]) is not None:\r
@@ -2280,11 +2288,11 @@ class PlatformAutoGen(AutoGen):
                     # Compare two Key, if one is included by another, choose the higher priority one\r
                     #\r
                     Target2, ToolChain2, Arch2, CommandType2, Attr2 = NextKey.split("_")\r
-                    if (Target1 == Target2 or Target1 == "*" or Target2 == "*") and\\r
-                        (ToolChain1 == ToolChain2 or ToolChain1 == "*" or ToolChain2 == "*") and\\r
-                        (Arch1 == Arch2 or Arch1 == "*" or Arch2 == "*") and\\r
-                        (CommandType1 == CommandType2 or CommandType1 == "*" or CommandType2 == "*") and\\r
-                        (Attr1 == Attr2 or Attr1 == "*" or Attr2 == "*"):\r
+                    if (Target1 == Target2 or Target1 == TAB_STAR or Target2 == TAB_STAR) and\\r
+                        (ToolChain1 == ToolChain2 or ToolChain1 == TAB_STAR or ToolChain2 == TAB_STAR) and\\r
+                        (Arch1 == Arch2 or Arch1 == TAB_STAR or Arch2 == TAB_STAR) and\\r
+                        (CommandType1 == CommandType2 or CommandType1 == TAB_STAR or CommandType2 == TAB_STAR) and\\r
+                        (Attr1 == Attr2 or Attr1 == TAB_STAR or Attr2 == TAB_STAR):\r
 \r
                         if self.CalculatePriorityValue(NowKey) > self.CalculatePriorityValue(NextKey):\r
                             if Options.get((self.BuildRuleFamily, NextKey)) is not None:\r
@@ -2313,9 +2321,9 @@ class PlatformAutoGen(AutoGen):
                     continue\r
                 FamilyMatch = True\r
             # expand any wildcard\r
-            if Target == "*" or Target == self.BuildTarget:\r
-                if Tag == "*" or Tag == self.ToolChain:\r
-                    if Arch == "*" or Arch == self.Arch:\r
+            if Target == TAB_STAR or Target == self.BuildTarget:\r
+                if Tag == TAB_STAR or Tag == self.ToolChain:\r
+                    if Arch == TAB_STAR or Arch == self.Arch:\r
                         if Tool not in BuildOptions:\r
                             BuildOptions[Tool] = {}\r
                         if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or Options[Key].startswith('='):\r
@@ -2348,9 +2356,9 @@ class PlatformAutoGen(AutoGen):
                 continue\r
 \r
             # expand any wildcard\r
-            if Target == "*" or Target == self.BuildTarget:\r
-                if Tag == "*" or Tag == self.ToolChain:\r
-                    if Arch == "*" or Arch == self.Arch:\r
+            if Target == TAB_STAR or Target == self.BuildTarget:\r
+                if Tag == TAB_STAR or Tag == self.ToolChain:\r
+                    if Arch == TAB_STAR or Arch == self.Arch:\r
                         if Tool not in BuildOptions:\r
                             BuildOptions[Tool] = {}\r
                         if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or Options[Key].startswith('='):\r
@@ -2593,7 +2601,7 @@ class ModuleAutoGen(AutoGen):
     ## Return the module build data object\r
     @cached_property\r
     def Module(self):\r
-        return self.Workspace.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
+        return self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
 \r
     ## Return the module name\r
     @cached_property\r
@@ -2941,7 +2949,7 @@ class ModuleAutoGen(AutoGen):
             except KeyError:\r
                 FlagOption = ''\r
 \r
-            if self.PlatformInfo.ToolChainFamily != 'RVCT':\r
+            if self.ToolChainFamily != 'RVCT':\r
                 IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]\r
             else:\r
                 #\r
@@ -2975,8 +2983,8 @@ class ModuleAutoGen(AutoGen):
     @cached_property\r
     def SourceFileList(self):\r
         RetVal = []\r
-        ToolChainTagSet = {"", "*", self.ToolChain}\r
-        ToolChainFamilySet = {"", "*", self.ToolChainFamily, self.BuildRuleFamily}\r
+        ToolChainTagSet = {"", TAB_STAR, self.ToolChain}\r
+        ToolChainFamilySet = {"", TAB_STAR, self.ToolChainFamily, self.BuildRuleFamily}\r
         for F in self.Module.Sources:\r
             # match tool chain\r
             if F.TagName not in ToolChainTagSet:\r
@@ -3051,7 +3059,7 @@ class ModuleAutoGen(AutoGen):
     def BinaryFileList(self):\r
         RetVal = []\r
         for F in self.Module.Binaries:\r
-            if F.Target not in [TAB_ARCH_COMMON, '*'] and F.Target != self.BuildTarget:\r
+            if F.Target not in [TAB_ARCH_COMMON, TAB_STAR] and F.Target != self.BuildTarget:\r
                 continue\r
             RetVal.append(F)\r
             self._ApplyBuildRule(F, F.Type, BinaryFileList=RetVal)\r
@@ -3657,6 +3665,10 @@ class ModuleAutoGen(AutoGen):
                 AsBuiltInfDict['binary_item'].append('PE32|' + self.Name + '.efi')\r
             else:\r
                 AsBuiltInfDict['binary_item'].append('BIN|' + File)\r
+        if not self.DepexGenerated:\r
+            DepexFile = os.path.join(self.OutputDir, self.Name + '.depex')\r
+            if os.path.exists(DepexFile):\r
+                self.DepexGenerated = True\r
         if self.DepexGenerated:\r
             self.OutputFile.add(self.Name + '.depex')\r
             if self.ModuleType in [SUP_MODULE_PEIM]:\r
@@ -3857,7 +3869,7 @@ class ModuleAutoGen(AutoGen):
         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
+            Ma = self.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