Changed the group names VpdGroup and HiiGroup to HiiEnable and VpdEnable. Changed...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@425 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 344111ac31d68111b8d6daac3f2b08ec2d939733..65db34a3248aaf67b1333f6867a7e9f7d42c32d5 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1276,8 +1276,8 @@
                             <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="HiiGroup"/>\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdGroup"/>\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
@@ -1303,8 +1303,8 @@
                             <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="HiiGroup"/>\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdGroup"/>\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="Value" type="xs:normalizedString"/>\r
@@ -1315,9 +1315,9 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    <xs:group name="HiiGroup">\r
+    <xs:group name="HiiEnable">\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">If HiiGroup is specified, then HiiEnable is default true</xs:documentation>\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
@@ -1325,7 +1325,10 @@
             <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r
     </xs:group>\r
-    <xs:group name="VpdGroup">\r
+    <xs:group name="VpdEnable">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">If VpdEnable group is specified, then VpdEnable is default true</xs:documentation>\r
+        </xs:annotation>\r
         <xs:sequence>\r
             <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 08a8ecffdd12dddb2a72cf585e5879a1f23d9020..d9da5f79b97e5c38b5e941645074beef81088897 100644 (file)
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -74,8 +74,8 @@
                     <xs:element name="FlashDefinition" type="FlashData"/>\r
                     <xs:element name="FlashDefinitionFile" type="FileNameConvention"/>\r
                 </xs:choice>\r
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImages"/>\r
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Capsules"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="FvImages"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Capsules"/>\r
             </xs:sequence>\r
             <xs:attribute name="MicrocodeFile" type="FileNameConvention" use="optional"/>\r
         </xs:complexType>\r