This patch is going to fix the issue of only Default SkuId is built into the External...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng, Bob C <bob.c.feng@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16006 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 8cd387072e26c8786dc375b5b6f1e906339163ad..0b6582845952e330aa6cbb7a9743bbd1744af34b 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -283,15 +283,7 @@ class WorkspaceAutoGen(AutoGen):
                             ExtraData="Build target [%s] is not supported by the platform. [Valid target: %s]"\r
                                       % (self.BuildTarget, " ".join(self.Platform.BuildTargets)))\r
 \r
-        # Validate SKU ID\r
-        if not self.SkuId:\r
-            self.SkuId = 'DEFAULT'\r
-\r
-        if self.SkuId not in self.Platform.SkuIds:\r
-            EdkLogger.error("build", PARAMETER_INVALID,\r
-                            ExtraData="SKU-ID [%s] is not supported by the platform. [Valid SKU-ID: %s]"\r
-                                      % (self.SkuId, " ".join(self.Platform.SkuIds.keys())))\r
-\r
+        \r
         # parse FDF file to get PCDs in it, if any\r
         if not self.FdfFile:\r
             self.FdfFile = self.Platform.FlashDefinition\r
@@ -996,11 +988,6 @@ class PlatformAutoGen(AutoGen):
                             PcdFromModule.IsFromBinaryInf == False:\r
                             # Print warning message to let the developer make a determine.\r
                             if PcdFromModule not in PcdNotInDb:\r
-                            #    EdkLogger.warn("build",\r
-                            #                   "A PCD listed in the DSC (%s.%s, %s) is used by a module not in the FDF. If the PCD is not used by any module listed in the FDF this PCD will be ignored. " \\r
-                            #                   % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, self.Platform.MetaFile.Path),\r
-                            #                   File=self.MetaFile, \\r
-                            #                   ExtraData=None)\r
                                 PcdNotInDb.append(PcdFromModule)\r
                             continue\r
                         # If one of the Source built modules listed in the DSC is not listed in \r
@@ -1105,19 +1092,6 @@ class PlatformAutoGen(AutoGen):
                                       % NoDatumTypePcdListString)\r
         self._NonDynamicPcdList = self._NonDynaPcdList_\r
         self._DynamicPcdList = self._DynaPcdList_\r
-        # If PCD is listed in a PcdsDynamicHii, PcdsDynamicExHii, PcdsDynamicHii or PcdsDynamicExHii\r
-        # section, and the PCD is not used by any module that is listed in the DSC file, the build \r
-        # provide a warning message.\r
-        #for PcdKey in self.Platform.Pcds.keys():\r
-        #    Pcd = self.Platform.Pcds[PcdKey]\r
-        #    if Pcd not in self._DynamicPcdList + PcdNotInDb and \\r
-        #        Pcd.Type in [TAB_PCDS_DYNAMIC, TAB_PCDS_DYNAMIC_DEFAULT, TAB_PCDS_DYNAMIC_HII, TAB_PCDS_DYNAMIC_EX, TAB_PCDS_DYNAMIC_EX_DEFAULT, TAB_PCDS_DYNAMIC_EX_HII]:\r
-        #        # Print warning message to let the developer make a determine.\r
-                #EdkLogger.warn("build",\r
-                #               "A %s PCD listed in the DSC (%s.%s, %s) is not used by any module." \\r
-                #               % (Pcd.Type, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, self.Platform.MetaFile.Path),\r
-                #               File=self.MetaFile, \\r
-                #               ExtraData=None)\r
         #\r
         # Sort dynamic PCD list to:\r
         # 1) If PCD's datum type is VOID* and value is unicode string which starts with L, the PCD item should \r