X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkPlatformDataElements.xsd;h=188ea9015c64f6e20e205bc6b2eabc56e21bc05b;hp=678179cf555cf54f08d488c8dfc8a3a3fe71692d;hb=f29b8a332e39980d0dbf9683ec1b631dedc6d78a;hpb=1be638edd117c755c70470a33a618a34f78777eb

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 678179cf55..188ea9015c 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -16,6 +16,7 @@
         <xs:documentation xml:lang="en"> This schema defines EFI and Framework Platform Data Elements that are specific to platform creation.</xs:documentation>
     </xs:annotation>
     <xs:include schemaLocation="NamingConvention.xsd"/>
+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
     <xs:include schemaLocation="FrameworkDataElements.xsd"/>
     <xs:element name="Capsule">
@@ -152,7 +153,7 @@
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
-            <xs:attributeGroup ref="BlockAttributes"/>
+            <xs:attributeGroup ref="FlashDeviceInfoAttributes"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="FlashDeviceOverrideImage">
@@ -188,7 +189,7 @@
                 <xs:element minOccurs="1" maxOccurs="unbounded" ref="FvImageNames"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="FvImageOptions"/>
             </xs:sequence>
-            <xs:attribute name="Type" type="xs:string" use="optional"/>
+            <xs:attribute name="Type" type="FvImageTypes" use="optional"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="FvImageName">
@@ -199,7 +200,7 @@
             <xs:attribute name="Name" type="FvRegionTypes" use="required"/>
         </xs:complexType>
     </xs:element>
-    <xs:element name="FvImageNames" type="xs:string"/>
+    <xs:element name="FvImageNames" type="xs:NCName"/>
     <xs:element name="FvImageOptions">
         <xs:annotation>
             <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
@@ -231,21 +232,22 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
-                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>  <!-- DO NOT USE! REMOVE in FINAL -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>  <!-- DO NOT USE! REMOVE in FINAL -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations">
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
             </xs:sequence>
             <xs:attributeGroup ref="MsaAttributes"/>
         </xs:complexType>
@@ -362,6 +364,14 @@
             <xs:enumeration value="4MB"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="FvImageTypes">
+        <xs:restriction base="xs:NCName">
+            <xs:enumeration value="Attributes"/>
+            <xs:enumeration value="Options"/>
+            <xs:enumeration value="Components"/>
+            <xs:enumeration value="ValidImageNames"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="FvSubRegionTypes">
         <xs:restriction base="UCNameType">
             <xs:enumeration value="NV_VARIABLE_STORE"/>
@@ -453,7 +463,7 @@
         <xs:attribute name="Name" type="xs:string" use="required"/>
         <xs:attribute name="Size" type="HexAddressType" use="required"/>
         <xs:attribute name="BaseAddress" type="HexAddressType" use="required"/>
-        <xs:attribute name="ErasePolarity" type="ZeroOrOne" use="required"/>
+        <xs:attribute name="ErasePolarity" type="Polarity" use="required"/>
     </xs:attributeGroup>
     <xs:attributeGroup name="RawDataAttributes">
         <xs:attribute name="Name" type="xs:string" use="required"/>