X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FCommon%2FMisc.py;h=8ba5819cc1e337af0b26f7c7c7f47f6e0c1954cc;hp=96ee30b2bfe8683591ff7ce982faeed7b91f560b;hb=a3251d844695f90711bfe094f12755fd01742369;hpb=22a99b87c4d29ebaa8713ac8f04d9d0c11c3add5

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 96ee30b2bf..8ba5819cc1 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -24,6 +24,7 @@ import re
 import cPickle
 import array
 import shutil
+from struct import pack
 from UserDict import IterableUserDict
 from UserList import UserList
 
@@ -1508,15 +1509,17 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=''):
         return [VpdOffset, Size, Value], IsValid, 2
     elif PcdType in (MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII):
         HiiString = FieldList[0]
-        Guid = Offset = Value = ''
+        Guid = Offset = Value = Attribute = ''
         if len(FieldList) > 1:
             Guid = FieldList[1]
         if len(FieldList) > 2:
             Offset = FieldList[2]
         if len(FieldList) > 3:
             Value = FieldList[3]
-        IsValid = (3 <= len(FieldList) <= 4)
-        return [HiiString, Guid, Offset, Value], IsValid, 3
+        if len(FieldList) > 4:
+            Attribute = FieldList[4]
+        IsValid = (3 <= len(FieldList) <= 5)
+        return [HiiString, Guid, Offset, Value, Attribute], IsValid, 3
     return [], False, 0
 
 ## AnalyzePcdData
@@ -1953,17 +1956,26 @@ class SkuClass():
         
         self.AvailableSkuIds = sdict()
         self.SkuIdSet = []
-        
+        self.SkuIdNumberSet = []
         if SkuIdentifier == '' or SkuIdentifier is None:
             self.SkuIdSet = ['DEFAULT']
+            self.SkuIdNumberSet = ['0U']
         elif SkuIdentifier == 'ALL':
             self.SkuIdSet = SkuIds.keys()
+            self.SkuIdNumberSet = [num.strip() + 'U' for num in SkuIds.values()]
         else:
             r = SkuIdentifier.split('|') 
             self.SkuIdSet=[r[k].strip() for k in range(len(r))]      
+            k = None
+            try: 
+                self.SkuIdNumberSet = [SkuIds[k].strip() + 'U' for k in self.SkuIdSet]   
+            except Exception:
+                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]
@@ -1990,10 +2002,31 @@ class SkuClass():
             return self.SkuIdSet[0]
         else:
             return 'DEFAULT'
-            
+    def __GetAvailableSkuIdNumber(self):
+        return self.SkuIdNumberSet
     SystemSkuId = property(__GetSystemSkuID)
     AvailableSkuIdSet = property(__GetAvailableSkuIds)
     SkuUsageType = property(__SkuUsageType)
+    AvailableSkuIdNumSet = property(__GetAvailableSkuIdNumber)
+
+#
+# Pack a registry format GUID
+#
+def PackRegistryFormatGuid(Guid):
+    Guid = Guid.split('-')
+    return pack('=LHHBBBBBBBB',
+                int(Guid[0], 16),
+                int(Guid[1], 16),
+                int(Guid[2], 16),
+                int(Guid[3][-4:-2], 16),
+                int(Guid[3][-2:], 16),
+                int(Guid[4][-12:-10], 16),
+                int(Guid[4][-10:-8], 16),
+                int(Guid[4][-8:-6], 16),
+                int(Guid[4][-6:-4], 16),
+                int(Guid[4][-4:-2], 16),
+                int(Guid[4][-2:], 16)
+                )
 
 ##
 #