merged the new changes in new schema, and corrected many inconsistencies in attribute...

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

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 4d163e0ffa735d23e8dd350eb418387cc610b011..3fb6b07af765a291587119731a392bc9b66ef22d 100644 (file)
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -221,11 +221,23 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>\r
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImage"/>\r
+                <xs:choice>\r
+                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImage"/>\r
+                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvRegionName"/>\r
+                </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImageName"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <xs:element name="FvRegionName">\r
+        <xs:complexType>\r
+            <xs:simpleContent>\r
+                <xs:extension base="KeywordType">\r
+                    <xs:attributeGroup ref="FvRegionNameAttributes"/>\r
+                </xs:extension>\r
+            </xs:simpleContent>\r
+        </xs:complexType>\r
+    </xs:element>    \r
     <xs:element name="ModuleSA">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">This element is used to specify information in the Platform Description File.</xs:documentation>\r
@@ -273,7 +285,7 @@
                         </xs:complexType>\r
                     </xs:element>\r
                 </xs:choice>\r
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>\r
                 <xs:choice>\r
                     <!-- DO NOT USE! REMOVE PcdBuildDeclarations in FINAL -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>\r
@@ -367,14 +379,14 @@
     <xs:element name="FlashDeviceDefinitions">\r
         <xs:complexType>\r
             <xs:annotation>\r
-                <xs:documentation xml:lang="en">We allow specifying the Flash layout in this directory, or we allow specifying a flashmap filename</xs:documentation>\r
+                <xs:documentation xml:lang="en">We allow specifying the FlashMap filename</xs:documentation>\r
             </xs:annotation>\r
             <xs:sequence>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="FlashDefinition" type="FlashData"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="FlashDefinitionFile" type="PathAndFilename"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="FvImages"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
-    </xs:element>    \r
+    </xs:element>\r
     <xs:element name="PlatformDefinitions">\r
         <xs:complexType>\r
             <xs:sequence>\r