Sync the type of <VariableName> with the latest email send by Larry.

[mirror_edk2.git] / Tools / XMLSchema / FrameworkDataElements.xsd

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 8427b738327ae5eebf61e8b833fc45937aa6f48f..665c19ae2256e5ac6d21bcacfe70a7d5932861ec 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1293,16 +1293,22 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r

-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r

                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r

-                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>\r
-                            <xs:choice minOccurs="0" maxOccurs="1">\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
-                            </xs:choice>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>\r
+                            <xs:element minOccurs="1" maxOccurs="unbounded" name="SkuInfo">\r
+                                <xs:complexType>\r
+                                    <xs:sequence>\r
+                                        <xs:element minOccurs="1" maxOccurs="1" name="SkuId" type="xs:nonNegativeInteger"/>\r
+                                        <xs:choice>\r
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="DefaultGroup"/>\r
+                                        </xs:choice>\r
+                                    </xs:sequence>\r
+                                </xs:complexType>\r
+                            </xs:element>\r

                         </xs:sequence>\r
                         <xs:attributeGroup ref="PcdAttributes"/>\r
                     </xs:complexType>\r
                         </xs:sequence>\r
                         <xs:attributeGroup ref="PcdAttributes"/>\r
                     </xs:complexType>\r


@@ -1320,29 +1326,29 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r

-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r

                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r

-                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>\r
-                            <xs:choice minOccurs="0" maxOccurs="1">\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
-                            </xs:choice>\r
-                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>                            \r

                             <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
                         </xs:sequence>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
                         </xs:sequence>\r

-                        <xs:attributeGroup ref="PcdAttributes"/>\r
+                        <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>\r

                     </xs:complexType>\r
                 </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
                     </xs:complexType>\r
                 </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

+    <xs:group name="DefaultGroup">\r
+        <xs:sequence>\r
+            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
+        </xs:sequence>\r
+    </xs:group>\r

     <xs:group name="HiiEnable">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>\r
         </xs:annotation>\r
         <xs:sequence>\r
     <xs:group name="HiiEnable">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>\r
         </xs:annotation>\r
         <xs:sequence>\r

-            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>\r
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>\r

             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>\r
             <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r
             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>\r
             <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r


@@ -1355,21 +1361,6 @@
             <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r
     </xs:group>\r
             <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r
     </xs:group>\r

-    <xs:group name="SkuGroup">\r
-        <xs:sequence>\r
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuSet" type="SkuListType"/>\r
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuList" type="SkuListType"/>\r
-            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>\r
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">\r
-                <xs:complexType>\r
-                    <xs:sequence minOccurs="1">\r
-                        <xs:element name="Id" type="xs:int"/>\r
-                        <xs:element name="Value" type="xs:normalizedString"/>\r
-                    </xs:sequence>\r
-                </xs:complexType>\r
-            </xs:element>\r
-        </xs:sequence>\r
-    </xs:group>\r

     <xs:element name="PcdCoded">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>\r
     <xs:element name="PcdCoded">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>\r


@@ -1406,7 +1397,7 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r

-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r

                             <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>\r