X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FCommon%2FMisc.py;h=a2c6a6a0fbd842b00fce6a0a57523d7066ae5498;hb=e651d06c5ed167e706e2dbe122ec0953a54033f3;hp=2ff8516469c03640642d49e9b5d02b01a1ebc591;hpb=2b8a6c44e0deb508f79804dd5ff7156bc7e25493;p=mirror_edk2.git

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 2ff8516469..a2c6a6a0fb 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -2149,9 +2149,6 @@ class SkuClass():
                 EdkLogger.error("build", PARAMETER_INVALID,
                             ExtraData = "SKU-ID [%s] is not supported by the platform. [Valid SKU-ID: %s]"
                                       % (k, " | ".join(SkuIds.keys())))
-        if len(self.SkuIdSet) == 2 and 'DEFAULT' in self.SkuIdSet and SkuIdentifier != 'ALL':
-            self.SkuIdSet.remove('DEFAULT')
-            self.SkuIdNumberSet.remove('0U')
         for each in self.SkuIdSet:
             if each in SkuIds:
                 self.AvailableSkuIds[each] = SkuIds[each][0]
@@ -2161,6 +2158,13 @@ class SkuClass():
                                       % (each, " | ".join(SkuIds.keys())))
         if self.SkuUsageType != self.SINGLE:
             self.AvailableSkuIds.update({'DEFAULT':0, 'COMMON':0})
+        if self.SkuIdSet:
+            GlobalData.gSkuids = (self.SkuIdSet)
+            if 'COMMON' in GlobalData.gSkuids:
+                GlobalData.gSkuids.remove('COMMON')
+            if GlobalData.gSkuids:
+                GlobalData.gSkuids.sort()
+
     def GetNextSkuId(self, skuname):
         if not self.__SkuInherit:
             self.__SkuInherit = {}