X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=665c19ae2256e5ac6d21bcacfe70a7d5932861ec;hp=8427b738327ae5eebf61e8b833fc45937aa6f48f;hb=02b4b59b2bb80e88409bb144463366e0f4e89b5d;hpb=5c5b48998b8e98c8ed69256e255f326d806dff4a

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 8427b73832..665c19ae22 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1293,16 +1293,22 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
-                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>
-                            <xs:choice minOccurs="0" maxOccurs="1">
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>
-                            </xs:choice>
-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="1" maxOccurs="unbounded" name="SkuInfo">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" name="SkuId" type="xs:nonNegativeInteger"/>
+                                        <xs:choice>
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="DefaultGroup"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
                     </xs:complexType>
@@ -1320,29 +1326,29 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
-                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>
-                            <xs:choice minOccurs="0" maxOccurs="1">
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>
-                            </xs:choice>
-                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>                            
                             <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>
                         </xs:sequence>
-                        <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:group name="DefaultGroup">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+        </xs:sequence>
+    </xs:group>
     <xs:group name="HiiEnable">
         <xs:annotation>
             <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>
             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
             <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>
         </xs:sequence>
@@ -1355,21 +1361,6 @@
             <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>
         </xs:sequence>
     </xs:group>
-    <xs:group name="SkuGroup">
-        <xs:sequence>
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuSet" type="SkuListType"/>
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuList" type="SkuListType"/>
-            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
-                <xs:complexType>
-                    <xs:sequence minOccurs="1">
-                        <xs:element name="Id" type="xs:int"/>
-                        <xs:element name="Value" type="xs:normalizedString"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-    </xs:group>
     <xs:element name="PcdCoded">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
@@ -1406,7 +1397,7 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>